projects
/
git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
merge-one-file: force content conflict for "both sides added" case
[git]
/
sequencer.c
2013-03-07
Junio C Hamano
Merge branch 'mp/complete-paths'
blob
|
commitdiff
|
raw
2013-03-07
Junio C Hamano
Merge branch 'mh/maint-ceil-absolute' into maint
blob
|
commitdiff
|
raw
2013-02-27
Junio C Hamano
Merge branch 'wk/man-deny-current-branch-is-default...
blob
|
commitdiff
|
raw
2013-02-27
Junio C Hamano
Merge branch 'jn/less-reconfigure' into maint
blob
|
commitdiff
|
raw
2013-02-27
Junio C Hamano
Merge branch 'mh/maint-ceil-absolute'
blob
|
commitdiff
|
raw
2013-02-25
Junio C Hamano
Merge branch 'jn/less-reconfigure'
blob
|
commitdiff
|
raw
2013-02-25
Junio C Hamano
Merge branch 'as/check-ignore'
blob
|
commitdiff
|
raw
2013-02-25
Junio C Hamano
Merge branch 'ct/autoconf-htmldir'
blob
|
commitdiff
|
raw
2013-02-25
Junio C Hamano
Merge branch 'wk/man-deny-current-branch-is-default...
blob
|
commitdiff
|
raw
2013-02-25
Junio C Hamano
Merge branch 'jc/mention-tracking-for-pull-default...
blob
|
commitdiff
|
raw
2013-02-25
Junio C Hamano
Merge branch 'da/p4merge-mktemp-fix' into maint
blob
|
commitdiff
|
raw
2013-02-25
Junio C Hamano
Merge branch 'al/mergetool-printf-fix' into maint
blob
|
commitdiff
|
raw
2013-02-25
Junio C Hamano
Merge branch 'jx/utf8-printf-width' into maint
blob
|
commitdiff
|
raw
2013-02-25
Junio C Hamano
Merge branch 'mg/bisect-doc' into maint
blob
|
commitdiff
|
raw
2013-02-25
Junio C Hamano
Merge branch 'sp/smart-http-content-type-check' into...
blob
|
commitdiff
|
raw
2013-02-25
Junio C Hamano
Merge branch 'jc/combine-diff-many-parents' into maint
blob
|
commitdiff
|
raw
2013-02-25
Junio C Hamano
Merge branch 'jk/apply-similaritly-parsing' into maint
blob
|
commitdiff
|
raw
2013-02-25
Junio C Hamano
Merge branch 'jk/remote-helpers-doc' into maint
blob
|
commitdiff
|
raw
2013-02-25
Junio C Hamano
Merge branch 'ab/gitweb-use-same-scheme' into maint
blob
|
commitdiff
|
raw
2013-02-25
Junio C Hamano
Merge branch 'zk/clean-report-failure' into maint
blob
|
commitdiff
|
raw
2013-02-25
Junio C Hamano
Merge branch 'nd/clone-no-separate-git-dir-with-bare...
blob
|
commitdiff
|
raw
2013-02-25
Junio C Hamano
Merge branch 'da/p4merge-mktemp' into maint
blob
|
commitdiff
|
raw
2013-02-20
Junio C Hamano
Merge branch 'ob/imap-send-ssl-verify' into maint
blob
|
commitdiff
|
raw
2013-02-19
Junio C Hamano
Merge branch 'jc/mention-tracking-for-pull-default'
blob
|
commitdiff
|
raw
2013-02-17
Junio C Hamano
Merge branch 'jk/rebase-i-comment-char'
blob
|
commitdiff
|
raw
2013-02-15
Junio C Hamano
Merge branch 'wk/man-deny-current-branch-is-default...
blob
|
commitdiff
|
raw
2013-02-15
Junio C Hamano
Merge branch 'da/p4merge-mktemp-fix'
blob
|
commitdiff
|
raw
2013-02-14
Junio C Hamano
Merge branch 'jk/diff-graph-cleanup'
blob
|
commitdiff
|
raw
2013-02-14
Junio C Hamano
Merge branch 'al/mergetool-printf-fix'
blob
|
commitdiff
|
raw
2013-02-14
Junio C Hamano
Merge branch 'jk/error-const-return'
blob
|
commitdiff
|
raw
2013-02-14
Junio C Hamano
Merge branch 'jx/utf8-printf-width'
blob
|
commitdiff
|
raw
2013-02-14
Junio C Hamano
Merge branch 'mg/bisect-doc'
blob
|
commitdiff
|
raw
2013-02-14
Junio C Hamano
Merge branch 'jc/extended-fake-ancestor-for-gitlink'
blob
|
commitdiff
|
raw
2013-02-14
Junio C Hamano
Merge branch 'dg/subtree-fixes'
blob
|
commitdiff
|
raw
2013-02-11
Junio C Hamano
Merge branch 'sp/smart-http-content-type-check'
blob
|
commitdiff
|
raw
2013-02-08
Junio C Hamano
Merge branch 'jc/combine-diff-many-parents'
blob
|
commitdiff
|
raw
2013-02-08
Junio C Hamano
Merge branch 'jk/apply-similaritly-parsing'
blob
|
commitdiff
|
raw
2013-02-08
Junio C Hamano
Merge branch 'mk/tcsh-complete-only-known-paths'
blob
|
commitdiff
|
raw
2013-02-08
Junio C Hamano
Merge branch 'mp/complete-paths'
blob
|
commitdiff
|
raw
2013-02-08
Junio C Hamano
Merge branch 'ct/autoconf-htmldir'
blob
|
commitdiff
|
raw
2013-02-07
Junio C Hamano
Merge branch 'mz/pick-unborn' into maint
blob
|
commitdiff
|
raw
2013-02-07
Junio C Hamano
Merge branch 'ft/transport-report-segv' into maint
blob
|
commitdiff
|
raw
|
diff to current
2013-02-07
Junio C Hamano
Merge branch 'sb/gpg-plug-fd-leak' into maint
blob
|
commitdiff
|
raw
|
diff to current
2013-02-07
Junio C Hamano
Merge branch 'jc/fake-ancestor-with-non-blobs' into...
blob
|
commitdiff
|
raw
|
diff to current
2013-02-07
Junio C Hamano
Merge branch 'jn/auto-depend-workaround-buggy-ccache...
blob
|
commitdiff
|
raw
|
diff to current
2013-02-07
Junio C Hamano
Merge branch 'da/mergetool-docs'
blob
|
commitdiff
|
raw
2013-02-07
Junio C Hamano
Merge branch 'ss/mergetools-tortoise'
blob
|
commitdiff
|
raw
2013-02-07
Junio C Hamano
Merge branch 'jk/mergetool'
blob
|
commitdiff
|
raw
2013-02-07
Junio C Hamano
Merge branch 'jk/remote-helpers-doc'
blob
|
commitdiff
|
raw
2013-02-07
Junio C Hamano
Merge branch 'sb/run-command-fd-error-reporting'
blob
|
commitdiff
|
raw
2013-02-07
Junio C Hamano
Merge branch 'ab/gitweb-use-same-scheme'
blob
|
commitdiff
|
raw
2013-02-06
Junio C Hamano
Merge branch 'jn/auto-depend-workaround-buggy-ccache'
blob
|
commitdiff
|
raw
2013-02-06
Junio C Hamano
Merge branch 'jc/fake-ancestor-with-non-blobs'
blob
|
commitdiff
|
raw
2013-02-06
Junio C Hamano
Merge branch 'sb/gpg-plug-fd-leak'
blob
|
commitdiff
|
raw
2013-02-06
Junio C Hamano
Merge branch 'ft/transport-report-segv'
blob
|
commitdiff
|
raw
2013-02-04
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2013-02-04
Junio C Hamano
Merge branch 'mm/add-u-A-sans-pathspec'
blob
|
commitdiff
|
raw
2013-02-04
Junio C Hamano
Merge branch 'jc/push-reject-reasons'
blob
|
commitdiff
|
raw
2013-02-04
Junio C Hamano
Merge branch 'jc/custom-comment-char'
blob
|
commitdiff
|
raw
2013-02-04
Junio C Hamano
Merge branch 'nd/edit-branch-desc-while-detached' into...
blob
|
commitdiff
|
raw
|
diff to current
2013-02-04
Junio C Hamano
Merge branch 'jn/do-not-drop-username-when-reading...
blob
|
commitdiff
|
raw
|
diff to current
2013-02-04
Junio C Hamano
Merge branch 'dl/am-hg-locale' into maint
blob
|
commitdiff
|
raw
|
diff to current
2013-02-04
Junio C Hamano
Merge branch 'jc/doc-maintainer' into maint
blob
|
commitdiff
|
raw
|
diff to current
2013-02-01
Junio C Hamano
Merge branch 'nd/edit-branch-desc-while-detached'
blob
|
commitdiff
|
raw
2013-02-01
Junio C Hamano
Merge branch 'jk/gc-auto-after-fetch'
blob
|
commitdiff
|
raw
2013-02-01
Junio C Hamano
Merge branch 'bc/git-p4-for-python-2.4'
blob
|
commitdiff
|
raw
2013-02-01
Junio C Hamano
Merge branch 'jn/do-not-drop-username-when-reading...
blob
|
commitdiff
|
raw
2013-02-01
Junio C Hamano
Merge branch 'jk/cvsimport-does-not-work-with-cvsps3'
blob
|
commitdiff
|
raw
2013-02-01
Junio C Hamano
Merge branch 'jc/do-not-let-random-file-interfere-with...
blob
|
commitdiff
|
raw
2013-02-01
Junio C Hamano
Merge branch 'as/test-cleanup'
blob
|
commitdiff
|
raw
2013-02-01
Junio C Hamano
Merge branch 'jc/no-git-config-in-clone'
blob
|
commitdiff
|
raw
2013-02-01
Junio C Hamano
Merge branch 'nd/fetch-depth-is-broken'
blob
|
commitdiff
|
raw
2013-01-30
Junio C Hamano
Merge git://ozlabs.org/~paulus/gitk
blob
|
commitdiff
|
raw
2013-01-30
Junio C Hamano
Merge branch 'nd/edit-branch-desc-while-detached' into...
blob
|
commitdiff
|
raw
2013-01-30
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
2013-01-30
Junio C Hamano
Merge branch 'tb/t0050-maint' into maint
blob
|
commitdiff
|
raw
|
diff to current
2013-01-29
Junio C Hamano
Merge branch 'ph/rebase-preserve-all-merges' into maint
blob
|
commitdiff
|
raw
|
diff to current
2013-01-28
Junio C Hamano
Sync with 1.8.1.2
blob
|
commitdiff
|
raw
2013-01-28
Junio C Hamano
Merge branch 'ss/help-htmlpath-config-doc' into maint
blob
|
commitdiff
|
raw
|
diff to current
2013-01-28
Junio C Hamano
Merge branch 'nd/attr-debug-fix' into maint
blob
|
commitdiff
|
raw
|
diff to current
2013-01-28
Junio C Hamano
Merge branch 'ds/completion-silence-in-tree-path-probe...
blob
|
commitdiff
|
raw
|
diff to current
2013-01-28
Junio C Hamano
Merge branch 'jn/maint-trim-vim-contrib' into maint
blob
|
commitdiff
|
raw
|
diff to current
2013-01-28
Junio C Hamano
Merge branch 'pe/doc-email-env-is-trumped-by-config...
blob
|
commitdiff
|
raw
|
diff to current
2013-01-28
Junio C Hamano
Merge branch 'ap/status-ignored-in-ignored-directory...
blob
|
commitdiff
|
raw
|
diff to current
2013-01-28
Junio C Hamano
Merge branch 'er/stop-recommending-parsecvs' into maint
blob
|
commitdiff
|
raw
|
diff to current
2013-01-28
Junio C Hamano
Merge branch 'mh/ceiling' into maint
blob
|
commitdiff
|
raw
|
diff to current
2013-01-28
Junio C Hamano
Merge branch 'tb/t0050-maint'
blob
|
commitdiff
|
raw
2013-01-28
Junio C Hamano
Merge branch 'dl/am-hg-locale'
blob
|
commitdiff
|
raw
2013-01-28
Junio C Hamano
Merge branch 'jc/help'
blob
|
commitdiff
|
raw
2013-01-28
Junio C Hamano
Merge branch 'bc/fix-array-syntax-for-3.0-in-completion...
blob
|
commitdiff
|
raw
2013-01-27
Junio C Hamano
Merge branch 'jk/maint-gc-auto-after-fetch' into jk...
blob
|
commitdiff
|
raw
|
diff to current
2013-01-25
Junio C Hamano
Merge branch 'nd/retire-fnmatch'
blob
|
commitdiff
|
raw
2013-01-25
Junio C Hamano
Merge branch 'jc/doc-maintainer'
blob
|
commitdiff
|
raw
2013-01-24
Junio C Hamano
Merge branch 'ch/add-auto-submitted-in-sample-post...
blob
|
commitdiff
|
raw
2013-01-24
Junio C Hamano
Merge branch 'as/check-ignore'
blob
|
commitdiff
|
raw
2013-01-24
Junio C Hamano
Merge branch 'rs/clarify-entry-cmp-sslice'
blob
|
commitdiff
|
raw
2013-01-24
Junio C Hamano
Merge branch 'jk/suppress-clang-warning'
blob
|
commitdiff
|
raw
2013-01-24
Junio C Hamano
Merge branch 'cr/push-force-tag-update'
blob
|
commitdiff
|
raw
2013-01-24
Junio C Hamano
Merge branch 'mh/imap-send-shrinkage'
blob
|
commitdiff
|
raw
2013-01-24
Junio C Hamano
Merge branch 'mo/cvs-server-updates'
blob
|
commitdiff
|
raw
next
projects / git / history
Junio C Hamano