projects
/
git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge branch 'jc/diff-index-unpack' into maint
[git]
/
merge-recursive.c
2011-10-16
Junio C Hamano
Merge branch 'jc/diff-index-unpack' into maint
blob
|
commitdiff
|
raw
2011-10-16
Junio C Hamano
Merge branch 'mm/rebase-i-exec-edit' into maint
blob
|
commitdiff
|
raw
2011-09-26
Junio C Hamano
Merge branch 'jc/namespace-doc-with-old-asciidoc'
blob
|
commitdiff
|
raw
2011-09-23
Junio C Hamano
Merge 1.7.6.4 in
blob
|
commitdiff
|
raw
2011-09-23
Junio C Hamano
merge-recursive: Do not look at working tree during...
blob
|
commitdiff
|
raw
2011-09-23
Junio C Hamano
Merge branch 'mh/check-ref-format-print-normalize'...
blob
|
commitdiff
|
raw
|
diff to current
2011-09-23
Junio C Hamano
Merge branch 'gb/maint-am-patch-format-error-message...
blob
|
commitdiff
|
raw
|
diff to current
2011-09-20
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2011-09-19
Junio C Hamano
Merge branch 'ph/format-patch-no-color'
blob
|
commitdiff
|
raw
|
diff to current
2011-09-17
Junio C Hamano
Merge branch 'ci/forbid-unwanted-current-branch-update'
blob
|
commitdiff
|
raw
|
diff to current
2011-09-15
Junio C Hamano
Merge branch 'ph/format-patch-no-color'
blob
|
commitdiff
|
raw
|
diff to current
2011-09-12
Junio C Hamano
Sync with 1.7.6.3
blob
|
commitdiff
|
raw
|
diff to current
2011-09-12
Junio C Hamano
Merge branch 'jn/remote-helpers-doc'
blob
|
commitdiff
|
raw
|
diff to current
2011-09-12
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2011-09-12
Junio C Hamano
Merge branch 'jk/tag-contains-ab' (early part) into...
blob
|
commitdiff
|
raw
|
diff to current
2011-09-12
Junio C Hamano
Merge branch 'jk/maint-config-param' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-09-12
Junio C Hamano
Merge branch 'jk/maint-1.7.2-status-ignored' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-09-06
Junio C Hamano
Merge branch 'rc/histogram-diff'
blob
|
commitdiff
|
raw
|
diff to current
2011-09-06
Junio C Hamano
Merge branch 'cb/maint-ls-files-error-report'
blob
|
commitdiff
|
raw
|
diff to current
2011-09-06
Junio C Hamano
Merge branch 'mh/check-ref-format-print-normalize'
blob
|
commitdiff
|
raw
|
diff to current
2011-09-06
Junio C Hamano
Sync with 1.7.6.2
blob
|
commitdiff
|
raw
|
diff to current
2011-09-02
Junio C Hamano
Merge branch 'js/i18n-scripts-2'
blob
|
commitdiff
|
raw
|
diff to current
2011-09-02
Junio C Hamano
Merge branch 'tr/maint-t3903-misquoted-command'
blob
|
commitdiff
|
raw
|
diff to current
2011-09-02
Junio C Hamano
Merge branch 'bc/bisect-test-use-shell-path'
blob
|
commitdiff
|
raw
|
diff to current
2011-09-02
Junio C Hamano
Merge branch 'va/p4-branch-import-test-update'
blob
|
commitdiff
|
raw
|
diff to current
2011-09-02
Junio C Hamano
Merge branch 'tr/maint-strbuf-grow-nul-termination'
blob
|
commitdiff
|
raw
|
diff to current
2011-09-02
Junio C Hamano
Merge branch 'tr/maint-ident-to-git-memmove'
blob
|
commitdiff
|
raw
|
diff to current
2011-09-02
Junio C Hamano
Merge branch 'tr/maint-format-patch-empty-output'
blob
|
commitdiff
|
raw
|
diff to current
2011-09-02
Junio C Hamano
Merge branch 'gb/maint-am-stgit-author-to-from-fix'
blob
|
commitdiff
|
raw
|
diff to current
2011-09-02
Junio C Hamano
Merge branch 'gb/maint-am-patch-format-error-message'
blob
|
commitdiff
|
raw
|
diff to current
2011-09-02
Junio C Hamano
Merge branch 'ms/daemon-timeout-is-in-seconds'
blob
|
commitdiff
|
raw
|
diff to current
2011-09-02
Junio C Hamano
Merge branch 'bg/t5540-osx-grep'
blob
|
commitdiff
|
raw
|
diff to current
2011-09-02
Junio C Hamano
Merge branch 'jc/clean-exclude-doc'
blob
|
commitdiff
|
raw
|
diff to current
2011-09-02
Junio C Hamano
Merge branch 'mg/maint-notes-C-doc'
blob
|
commitdiff
|
raw
|
diff to current
2011-09-02
Junio C Hamano
Merge branch 'fg/submodule-ff-check-before-push'
blob
|
commitdiff
|
raw
|
diff to current
2011-09-02
Junio C Hamano
Merge branch 'rc/diff-cleanup-records'
blob
|
commitdiff
|
raw
|
diff to current
2011-09-02
Junio C Hamano
Merge branch 'fk/use-kwset-pickaxe-grep-f'
blob
|
commitdiff
|
raw
|
diff to current
2011-09-02
Junio C Hamano
Merge branch 'en/merge-recursive-2'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-30
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-29
Junio C Hamano
Merge branch 'nd/decorate-grafts'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-29
Junio C Hamano
Merge branch 'nd/maint-clone-gitdir'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-29
Junio C Hamano
Merge branch 'ci/forbid-unwanted-current-branch-update'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-29
Junio C Hamano
Merge branch 'jk/pager-with-external-command'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-29
Junio C Hamano
Merge branch 'jc/maint-clone-alternates'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-29
Junio C Hamano
Merge branch 'jk/color-and-pager'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-29
Junio C Hamano
Merge branch 'mh/attr'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-29
Junio C Hamano
Merge branch 'di/fast-import-tagging'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-29
Junio C Hamano
Merge branch 'di/fast-import-blob-tweak'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-29
Junio C Hamano
Merge branch 'di/fast-import-deltified-tree'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-29
Junio C Hamano
Merge branch 'di/fast-import-ident'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-29
Junio C Hamano
Merge branch 'bw/doc-repo-layout'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-29
Junio C Hamano
Merge branch 'va/p4-branch-import'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-29
Junio C Hamano
Merge branch 'jc/combine-diff-callback'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-29
Junio C Hamano
Merge branch 'nk/branch-v-abbrev'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-25
Junio C Hamano
Merge branch 'jc/merge-reword'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-25
Junio C Hamano
Merge branch 'mg/branch-set-upstream-previous'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-25
Junio C Hamano
Merge branch 'da/difftool-mergtool-refactor'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-25
Junio C Hamano
Merge branch 'jc/maint-autofix-tag-in-head'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-25
Junio C Hamano
Merge branch 'di/fast-import-doc'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-25
Junio C Hamano
Merge branch 'jn/plug-empty-tree-leak'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-25
Junio C Hamano
Merge branch 'ac/describe-dirty-refresh'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-25
Junio C Hamano
Merge branch 'di/parse-options-split'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-25
Junio C Hamano
Merge branch 'js/i18n-scripts'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-25
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-24
Junio C Hamano
Sync with 1.7.6.1
blob
|
commitdiff
|
raw
|
diff to current
2011-08-23
Junio C Hamano
Merge branch 'rt/zlib-smaller-window'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-23
Junio C Hamano
Merge branch 'jn/maint-test-return'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-23
Junio C Hamano
Merge branch 'cb/maint-ls-files-error-report'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-23
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-23
Junio C Hamano
Merge branch 'jc/maint-combined-diff-work-tree' into...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-23
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-19
Junio C Hamano
Merge branch 'db/am-skip-blank-at-the-beginning'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-19
Junio C Hamano
Merge branch 'ma/am-exclude'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-19
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-18
Junio C Hamano
Merge branch 'mh/check-attr-relative'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-18
Junio C Hamano
Merge branch 'js/bisect-no-checkout'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-18
Junio C Hamano
Merge branch 'rc/histogram-diff'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-18
Junio C Hamano
Merge branch 'jc/maint-combined-diff-work-tree'
blob
|
commitdiff
|
raw
|
diff to current
2011-08-18
Junio C Hamano
Merge branch 'rc/histogram-diff' into HEAD
blob
|
commitdiff
|
raw
|
diff to current
2011-08-16
Jonathan Nieder
merge-recursive: take advantage of hardcoded empty...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-16
Junio C Hamano
Merge branch 'jk/tag-list-multiple-patterns' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-08-16
Junio C Hamano
Merge branch 'jl/submodule-add-relurl-wo-upstream'...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-16
Junio C Hamano
Merge branch 'jk/fast-export-quote-path' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-08-16
Junio C Hamano
Merge branch 'bw/log-all-ref-updates-doc' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-08-16
Junio C Hamano
Merge branch 'js/maint-add-path-stat-pwd' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-08-16
Junio C Hamano
Merge branch 'jn/mime-type-with-params' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-08-16
Junio C Hamano
Merge branch 'jc/submodule-sync-no-auto-vivify' into...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-16
Junio C Hamano
Merge branch 'jc/zlib-wrap' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-08-16
Junio C Hamano
Merge branch 'bc/submodule-foreach-stdin-fix-1.7.4...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-16
Junio C Hamano
Merge branch 'jc/diff-index-quick-exit-early' into...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-14
Elijah Newren
merge-recursive: Don't re-sort a list whose order we...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-14
Elijah Newren
merge-recursive: Fix virtual merge base for rename...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-14
Elijah Newren
merge-recursive: Avoid unnecessary file rewrites
blob
|
commitdiff
|
raw
|
diff to current
2011-08-14
Elijah Newren
merge-recursive: Fix spurious 'refusing to lose untrack...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-14
Elijah Newren
merge-recursive: Fix working copy handling for rename...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-14
Elijah Newren
merge-recursive: add handling for rename/rename/add...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-14
Elijah Newren
merge-recursive: Have conflict_rename_delete reuse...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-14
Elijah Newren
merge-recursive: Make modify/delete handling code reusable
blob
|
commitdiff
|
raw
|
diff to current
2011-08-14
Elijah Newren
merge-recursive: Consider modifications in rename/renam...
blob
|
commitdiff
|
raw
|
diff to current
2011-08-14
Elijah Newren
merge-recursive: Create function for merging with branc...
blob
|
commitdiff
|
raw
|
diff to current
next
projects / git / history
Junio C Hamano
Jonathan Nieder
Elijah Newren