projects
/
git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge branch 'jk/cherry-pick-root-with-resolve'
[git]
/
builtin
/
merge.c
2011-05-20
Junio C Hamano
Merge branch 'jk/cherry-pick-root-with-resolve'
blob
|
commitdiff
|
raw
2011-05-20
Junio C Hamano
Merge branch 'jc/maint-pathspec-stdin-and-cmdline'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-20
Junio C Hamano
Merge 1.7.5.2 in
blob
|
commitdiff
|
raw
|
diff to current
2011-05-16
Junio C Hamano
Merge branch 'jc/convert'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-16
Junio C Hamano
Merge branch 'ci/commit--interactive-atomic'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-16
Junio C Hamano
Merge branch 'sg/completion-updates'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-16
Junio C Hamano
Merge branch 'kk/maint-prefix-in-config-mak'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-16
Junio C Hamano
Merge branch 'mg/merge-ff-config'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-16
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-16
Junio C Hamano
Merge branch 'jn/maint-format-patch-doc' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-05-16
Junio C Hamano
Merge branch 'ss/cherry-pick-x-doc' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-05-16
Junio C Hamano
Merge branch 'vr/merge-base-doc' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-05-16
Junio C Hamano
Merge branch 'sr/maint-fast-import-tighten-option-parsi...
blob
|
commitdiff
|
raw
|
diff to current
2011-05-16
Junio C Hamano
Merge branch 'jc/t1506-shell-param-expansion-gotcha...
blob
|
commitdiff
|
raw
|
diff to current
2011-05-16
Junio C Hamano
Merge branch 'jc/fix-add-u-unmerged' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-05-16
Junio C Hamano
Merge branch 'jn/gitweb-dependency' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-05-16
Junio C Hamano
Merge branch 'jc/maint-branch-mergeoptions' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-05-16
Junio C Hamano
Merge branch 'jc/maint-add-p-overlapping-hunks' into...
blob
|
commitdiff
|
raw
|
diff to current
2011-05-16
Jeff King
cherry-pick: handle root commits with external strategies
blob
|
commitdiff
|
raw
|
diff to current
2011-05-15
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-15
Junio C Hamano
Merge branch 'jk/format-patch-quote-special-in-from...
blob
|
commitdiff
|
raw
|
diff to current
2011-05-15
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-13
Junio C Hamano
Merge branch 'bf/commit-template-no-cleanup'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-13
Junio C Hamano
Merge branch 'jc/t1506-shell-param-expansion-gotcha'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-13
Junio C Hamano
Merge branch 'rr/rerere-libify-clear-gc'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-13
Junio C Hamano
Merge branch 'js/maint-send-pack-stateless-rpc-deadlock...
blob
|
commitdiff
|
raw
|
diff to current
2011-05-13
Junio C Hamano
Merge branch 'jh/dirstat-lines'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-13
Junio C Hamano
Merge branch 'jc/fix-add-u-unmerged'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-13
Junio C Hamano
Merge branch 'jn/setup-revisions-glob-and-friends-passthru'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-13
Junio C Hamano
Merge branch 'cn/log-parse-opt'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-13
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-13
Junio C Hamano
Merge branch 'aw/maint-rebase-i-p-no-ff' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-05-13
Junio C Hamano
Merge branch 'gr/cvsimport-alternative-cvspass-location...
blob
|
commitdiff
|
raw
|
diff to current
2011-05-13
Junio C Hamano
Merge branch 'jk/merge-one-file-working-tree' into...
blob
|
commitdiff
|
raw
|
diff to current
2011-05-13
Junio C Hamano
Merge branch 'jc/fix-diff-files-unmerged' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-05-13
Junio C Hamano
Merge branch 'mz/maint-rename-unmerged' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-05-13
Junio C Hamano
Merge branch 'nd/struct-pathspec'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-11
Junio C Hamano
Merge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-11
Junio C Hamano
Merge branch 'jc/maint-1.6.6-pathspec-stdin-and-cmdline'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-11
Junio C Hamano
Merge branch 'jn/gitweb-dependency'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-11
Junio C Hamano
Merge branch 'jc/maint-branch-mergeoptions'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-11
Junio C Hamano
Merge branch 'jn/maint-test-merge-verify-parents'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-11
Junio C Hamano
Merge branch 'vh/config-interactive-singlekey-doc'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-11
Junio C Hamano
Merge branch 'jc/maint-add-p-overlapping-hunks'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-11
Junio C Hamano
Merge branch 'sr/maint-fast-import-tighten-option-parsing'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-11
Junio C Hamano
Merge branch 'dm/http-cleanup'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-11
Junio C Hamano
Merge branch 'jn/ctags'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-10
Junio C Hamano
Merge branch 'fc/completion-zsh' into sg/completion...
blob
|
commitdiff
|
raw
|
diff to current
2011-05-06
Junio C Hamano
merge: introduce merge.ff configuration variable
blob
|
commitdiff
|
raw
|
diff to current
2011-05-06
Junio C Hamano
Merge branch 'jc/maint-branch-mergeoptions' into mg...
blob
|
commitdiff
|
raw
|
diff to current
2011-05-06
Junio C Hamano
Merge branch 'jn/run-command-error-failure'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-06
Junio C Hamano
Merge branch 'js/info-man-path'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-06
Junio C Hamano
Merge branch 'im/hashcmp-optim'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-06
Junio C Hamano
Merge branch 'jk/merge-one-file-working-tree'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-06
Junio C Hamano
Merge branch 'jc/fix-diff-files-unmerged'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-06
Junio C Hamano
Merge branch 'cj/p4merge'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-06
Junio C Hamano
Merge branch 'gr/cvsimport-alternative-cvspass-location'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-06
Junio C Hamano
Merge branch 'sg/completion-cleanup'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-06
Junio C Hamano
Merge branch 'js/blame-parsename'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-06
Junio C Hamano
Merge branch 'jk/format-patch-quote-special-in-from'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-06
Junio C Hamano
Merge branch 'nd/struct-pathspec'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-06
Junio C Hamano
Merge branch 'aw/maint-rebase-i-p-no-ff'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-06
Junio C Hamano
Merge branch 'mg/alias-expose-prefix'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-06
Junio C Hamano
Merge branch 'mg/diff-uiconfig-doc'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-06
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-05
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-04
Junio C Hamano
Merge branch 'ml/test-readme'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-04
Junio C Hamano
Merge branch 'ft/gitweb-tar-with-gzip-n'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-04
Junio C Hamano
Merge branch 'mg/rev-list-count-cherry'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-04
Junio C Hamano
Merge branch 'ss/doc-svn'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-04
Junio C Hamano
Merge branch 'jn/format-patch-doc'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-04
Junio C Hamano
Merge branch 'vr/merge-base-doc'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-04
Junio C Hamano
Merge branch 'ss/cherry-pick-x-doc'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-04
Junio C Hamano
Merge branch 'jn/maint-format-patch-doc'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-04
Junio C Hamano
Merge branch 'jk/format-patch-multiline-header'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-04
Junio C Hamano
Merge branch 'jm/mergetool-submodules'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-04
Junio C Hamano
Sync with 1.7.5.1
blob
|
commitdiff
|
raw
|
diff to current
2011-05-04
Junio C Hamano
Merge branch 'jh/dirstat' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-05-04
Junio C Hamano
Merge branch 'sp/maint-clear-postfields' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-05-04
Junio C Hamano
Merge branch 'jk/maint-stash-oob' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-05-04
Junio C Hamano
Merge branch 'jk/maint-upload-pack-shallow' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-05-04
Junio C Hamano
Merge branch 'jc/pack-objects-bigfile' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-05-04
Junio C Hamano
Merge branch 'mg/reflog-with-options' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-05-04
Junio C Hamano
Merge branch 'ar/clean-rmdir-empty' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-05-04
Junio C Hamano
Merge branch 'mg/sha1-path-advise' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-05-02
Junio C Hamano
Merge branch 'jk/notes-ui-updates'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-02
Junio C Hamano
Merge branch 'ab/i18n-fixup'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-02
Junio C Hamano
Merge branch 'nm/submodule-update-force'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-02
Junio C Hamano
Merge branch 'jh/notes-add-ui'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-02
Junio C Hamano
Merge branch 'nd/maint-setup'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-02
Junio C Hamano
Merge branch 'mz/maint-rename-unmerged'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-01
Junio C Hamano
Merge branch 'rs/strbuf-setlen-assert'
blob
|
commitdiff
|
raw
|
diff to current
2011-05-01
Junio C Hamano
Merge branch 'vh/git-svn-doc'
blob
|
commitdiff
|
raw
|
diff to current
2011-04-29
Junio C Hamano
Merge branch 'maint'
blob
|
commitdiff
|
raw
|
diff to current
2011-04-29
Junio C Hamano
Merge branch 'mg/x-years-12-months' into maint
blob
|
commitdiff
|
raw
|
diff to current
2011-04-28
Junio C Hamano
Merge branch 'jc/diff-irreversible-delete'
blob
|
commitdiff
|
raw
|
diff to current
2011-04-28
Junio C Hamano
Merge branch 'jc/rename-degrade-cc-to-c'
blob
|
commitdiff
|
raw
|
diff to current
2011-04-28
Junio C Hamano
Merge branch 'mz/rebase'
blob
|
commitdiff
|
raw
|
diff to current
2011-04-28
Junio C Hamano
Merge branch 'en/merge-recursive'
blob
|
commitdiff
|
raw
|
diff to current
2011-04-28
Junio C Hamano
Merge branch 'jh/dirstat'
blob
|
commitdiff
|
raw
|
diff to current
next
projects / git / history
Junio C Hamano
Jeff King