projects
/
git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
config: rename "gc.pruneWorktreesExpire" to "gc.worktreePruneExpire"
[git]
/
builtin
/
merge-recursive.c
2014-11-19
Junio C Hamano
Merge branch 'sv/submitting-final-patch'
blob
|
commitdiff
|
raw
2014-11-18
Junio C Hamano
Merge branch 'jc/doc-commit-only'
blob
|
commitdiff
|
raw
2014-11-12
Junio C Hamano
Merge branch 'nd/gitignore-trailing-whitespace' into...
blob
|
commitdiff
|
raw
2014-11-11
Junio C Hamano
Merge branch 'rs/clean-menu-item-defn' into maint
blob
|
commitdiff
|
raw
2014-11-10
Junio C Hamano
Merge branch 'js/diff-highlight-avoid-sigpipe'
blob
|
commitdiff
|
raw
2014-11-06
Junio C Hamano
Merge branch 'nd/gitignore-trailing-whitespace'
blob
|
commitdiff
|
raw
2014-11-06
Junio C Hamano
Merge branch 'tm/line-log-first-parent'
blob
|
commitdiff
|
raw
2014-10-31
Junio C Hamano
Merge branch 'rs/grep-color-words'
blob
|
commitdiff
|
raw
2014-10-30
Junio C Hamano
Merge git://ozlabs.org/~paulus/gitk
blob
|
commitdiff
|
raw
2014-10-29
Junio C Hamano
Merge branch 'bc/asciidoc-pretty-formats-fix' into...
blob
|
commitdiff
|
raw
2014-10-29
Junio C Hamano
Merge branch 'rs/daemon-fixes' into maint
blob
|
commitdiff
|
raw
2014-10-29
Junio C Hamano
Merge branch 'mg/lib-gpg-ro-safety'
blob
|
commitdiff
|
raw
2014-10-16
Junio C Hamano
Merge branch 'jc/completion-no-chdir'
blob
|
commitdiff
|
raw
2014-10-14
Junio C Hamano
Merge branch 'bc/asciidoc-pretty-formats-fix'
blob
|
commitdiff
|
raw
2014-10-14
Junio C Hamano
Merge branch 'rs/mailsplit'
blob
|
commitdiff
|
raw
2014-10-14
Junio C Hamano
Merge branch 'rs/daemon-fixes'
blob
|
commitdiff
|
raw
2014-10-07
Junio C Hamano
Merge branch 'maint-1.8.5' into maint-1.9
blob
|
commitdiff
|
raw
2014-09-30
Junio C Hamano
Merge branch 'jc/test-lazy-prereq'
blob
|
commitdiff
|
raw
2014-09-30
Junio C Hamano
Merge branch 'sb/merge-recursive-copy-paste-fix'
blob
|
commitdiff
|
raw
2014-09-30
Junio C Hamano
Merge branch 'jk/index-pack-threading-races' into maint
blob
|
commitdiff
|
raw
2014-09-29
Junio C Hamano
Merge branch 'sb/t6031-typofix'
blob
|
commitdiff
|
raw
2014-09-29
Junio C Hamano
Merge branch 'sb/t9300-typofix'
blob
|
commitdiff
|
raw
2014-09-26
Junio C Hamano
Merge branch 'sb/help-unknown-command-sort-fix'
blob
|
commitdiff
|
raw
2014-09-19
Junio C Hamano
Merge branch 'jn/unpack-trees-checkout-m-carry-deletion...
blob
|
commitdiff
|
raw
2014-09-19
Junio C Hamano
Merge branch 'lf/bundle-exclusion' into maint
blob
|
commitdiff
|
raw
2014-09-19
Junio C Hamano
Merge branch 'jk/command-line-config-empty-string'...
blob
|
commitdiff
|
raw
2014-09-19
Junio C Hamano
Merge branch 'rs/export-strbuf-addchars'
blob
|
commitdiff
|
raw
2014-09-19
Junio C Hamano
Merge branch 'jk/index-pack-threading-races'
blob
|
commitdiff
|
raw
2014-09-11
Junio C Hamano
Merge branch 'jn/unpack-trees-checkout-m-carry-deletion'
blob
|
commitdiff
|
raw
2014-09-09
Junio C Hamano
Merge branch 'rs/clean-menu-item-defn'
blob
|
commitdiff
|
raw
2014-09-09
Junio C Hamano
Merge branch 'sb/mailsplit-dead-code-removal'
blob
|
commitdiff
|
raw
2014-09-09
Junio C Hamano
Merge branch 'sb/blame-msg-i18n'
blob
|
commitdiff
|
raw
2014-09-09
Junio C Hamano
Merge branch 'lf/bundle-exclusion'
blob
|
commitdiff
|
raw
2014-09-09
Junio C Hamano
Merge branch 'jk/command-line-config-empty-string'
blob
|
commitdiff
|
raw
2014-09-09
Junio C Hamano
Merge branch 'bc/imap-send-doc'
blob
|
commitdiff
|
raw
2014-09-02
Junio C Hamano
Merge branch 'bc/archive-pax-header-mode'
blob
|
commitdiff
|
raw
2014-08-10
Junio C Hamano
Merge branch 'master' of git://ozlabs.org/~paulus/gitk
blob
|
commitdiff
|
raw
2014-08-04
Junio C Hamano
Merge branch 'tf/maint-doc-push'
blob
|
commitdiff
|
raw
2014-07-23
Junio C Hamano
Merge branch 'rs/fix-unlink-unix-socket'
blob
|
commitdiff
|
raw
2014-07-22
Junio C Hamano
Merge branch 'ah/fix-http-push' into maint
blob
|
commitdiff
|
raw
2014-07-22
Junio C Hamano
Merge branch 'zk/log-graph-showsig' into maint
blob
|
commitdiff
|
raw
2014-07-22
Junio C Hamano
Merge branch 'mg/fix-log-mergetag-color' into maint
blob
|
commitdiff
|
raw
2014-07-22
Junio C Hamano
Merge branch 'ep/shell-assign-and-export-vars' into...
blob
|
commitdiff
|
raw
2014-07-22
Junio C Hamano
Merge branch 'maint-1.8.5' into maint-1.9
blob
|
commitdiff
|
raw
2014-07-21
Junio C Hamano
Merge branch 'ek/alt-odb-entry-fix'
blob
|
commitdiff
|
raw
2014-07-16
Junio C Hamano
Merge branch 'ah/fix-http-push'
blob
|
commitdiff
|
raw
2014-07-16
Junio C Hamano
Merge branch 'zk/log-graph-showsig'
blob
|
commitdiff
|
raw
2014-07-16
Junio C Hamano
Merge branch 'mg/fix-log-mergetag-color'
blob
|
commitdiff
|
raw
2014-07-16
Junio C Hamano
Merge branch 'rs/fix-alt-odb-path-comparison' into...
blob
|
commitdiff
|
raw
2014-07-16
Junio C Hamano
Merge branch 'maint-1.8.5' into maint-1.9
blob
|
commitdiff
|
raw
2014-07-10
Junio C Hamano
Merge branch 'rs/fix-alt-odb-path-comparison'
blob
|
commitdiff
|
raw
2014-07-10
Junio C Hamano
Merge branch 'jk/repack-pack-keep-objects' into maint
blob
|
commitdiff
|
raw
2014-07-10
Junio C Hamano
Merge branch 'mc/doc-submodule-sync-recurse' into maint
blob
|
commitdiff
|
raw
2014-07-02
Junio C Hamano
Merge branch 'maint-1.8.5' into maint
blob
|
commitdiff
|
raw
2014-06-27
Junio C Hamano
Merge git://ozlabs.org/~paulus/gitk
blob
|
commitdiff
|
raw
2014-06-26
Junio C Hamano
Merge early parts from git://ozlabs.org/~paulus/gitk.git
blob
|
commitdiff
|
raw
2014-06-26
Junio C Hamano
Merge git://repo.or.cz/git-gui
blob
|
commitdiff
|
raw
2014-06-25
Junio C Hamano
Merge branch 'mc/doc-submodule-sync-recurse'
blob
|
commitdiff
|
raw
2014-06-25
Junio C Hamano
Merge branch 'jk/repack-pack-writebitmaps-config'
blob
|
commitdiff
|
raw
2014-06-25
Junio C Hamano
Merge branch 'jk/repack-pack-keep-objects'
blob
|
commitdiff
|
raw
2014-06-25
Junio C Hamano
Merge branch 'ym/fix-opportunistic-index-update-race...
blob
|
commitdiff
|
raw
2014-06-25
Junio C Hamano
Merge branch 'mk/show-s-no-extra-blank-line-for-merges...
blob
|
commitdiff
|
raw
2014-06-25
Junio C Hamano
Merge branch 'rr/rebase-autostash-fix' into maint
blob
|
commitdiff
|
raw
2014-06-25
Junio C Hamano
Merge branch 'jc/shortlog-ref-exclude' into maint
blob
|
commitdiff
|
raw
2014-06-25
Junio C Hamano
Merge branch 'fc/rerere-conflict-style' into maint
blob
|
commitdiff
|
raw
2014-06-25
Junio C Hamano
Merge branch 'rs/mailinfo-header-cmp' into maint
blob
|
commitdiff
|
raw
2014-06-25
Junio C Hamano
Merge branch 'sk/spawn-less-case-insensitively-from...
blob
|
commitdiff
|
raw
2014-06-25
Junio C Hamano
Merge branch 'jk/diff-follow-must-take-one-pathspec...
blob
|
commitdiff
|
raw
2014-06-25
Junio C Hamano
Merge branch 'jk/diff-files-assume-unchanged' into...
blob
|
commitdiff
|
raw
2014-06-25
Junio C Hamano
Merge branch 'jk/commit-C-pick-empty' into maint
blob
|
commitdiff
|
raw
2014-06-25
Junio C Hamano
Merge branch 'jc/apply-ignore-whitespace' into maint
blob
|
commitdiff
|
raw
2014-06-25
Junio C Hamano
Merge branch 'jc/revision-dash-count-parsing' into...
blob
|
commitdiff
|
raw
2014-06-25
Junio C Hamano
Merge branch 'jk/report-fail-to-read-objects-better...
blob
|
commitdiff
|
raw
2014-06-20
Junio C Hamano
Merge branch 'jc/test-lazy-prereq' (early part)
blob
|
commitdiff
|
raw
2014-06-20
Junio C Hamano
Merge branch 'tb/t5551-clone-notice-to-stderr'
blob
|
commitdiff
|
raw
2014-06-20
Junio C Hamano
Merge branch 'jc/revision-dash-count-parsing'
blob
|
commitdiff
|
raw
2014-06-16
Junio C Hamano
Merge branch 'jk/error-resolve-conflict-advice'
blob
|
commitdiff
|
raw
2014-06-16
Junio C Hamano
Merge branch 'jk/daemon-tolower'
blob
|
commitdiff
|
raw
2014-06-16
Junio C Hamano
Merge branch 'jk/diff-follow-must-take-one-pathspec'
blob
|
commitdiff
|
raw
2014-06-16
Junio C Hamano
Merge branch 'rr/rebase-autostash-fix'
blob
|
commitdiff
|
raw
2014-06-16
Junio C Hamano
Merge branch 'jk/report-fail-to-read-objects-better'
blob
|
commitdiff
|
raw
2014-06-16
Junio C Hamano
Merge branch 'jk/diff-files-assume-unchanged'
blob
|
commitdiff
|
raw
2014-06-09
Junio C Hamano
Merge branch 'jc/shortlog-ref-exclude'
blob
|
commitdiff
|
raw
2014-06-09
Junio C Hamano
Merge branch 'rs/mailinfo-header-cmp'
blob
|
commitdiff
|
raw
2014-06-06
Junio C Hamano
Merge branch 'jn/test-lint-unmoor'
blob
|
commitdiff
|
raw
2014-06-06
Junio C Hamano
Merge branch 'ep/shell-assign-and-export-vars'
blob
|
commitdiff
|
raw
2014-06-06
Junio C Hamano
Merge branch 'mt/rebase-i-keep-empty-test'
blob
|
commitdiff
|
raw
2014-06-06
Junio C Hamano
Merge branch 'mk/show-s-no-extra-blank-line-for-merges'
blob
|
commitdiff
|
raw
2014-06-06
Junio C Hamano
Merge branch 'sk/spawn-less-case-insensitively-from...
blob
|
commitdiff
|
raw
2014-06-06
Junio C Hamano
Merge branch 'sk/submodules-absolute-path-on-windows'
blob
|
commitdiff
|
raw
2014-06-06
Junio C Hamano
Merge branch 'fc/status-printf-squelch-format-zero...
blob
|
commitdiff
|
raw
2014-06-06
Junio C Hamano
Merge branch 'jk/commit-C-pick-empty'
blob
|
commitdiff
|
raw
2014-06-03
Junio C Hamano
Merge branch 'fc/rerere-conflict-style'
blob
|
commitdiff
|
raw
2014-06-03
Junio C Hamano
Merge branch 'ym/fix-opportunistic-index-update-race'
blob
|
commitdiff
|
raw
2014-06-03
Junio C Hamano
Merge branch 'jc/apply-ignore-whitespace'
blob
|
commitdiff
|
raw
2014-05-28
Junio C Hamano
Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname...
blob
|
commitdiff
|
raw
2014-05-28
Junio C Hamano
Merge branch 'mw/symlinks' into maint
blob
|
commitdiff
|
raw
2014-05-19
Junio C Hamano
Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname'
blob
|
commitdiff
|
raw
2014-05-19
Junio C Hamano
Merge branch 'jl/use-vsatisfy-correctly-for-2.0'
blob
|
commitdiff
|
raw
2014-05-19
Junio C Hamano
Merge branch 'kb/fast-hashmap'
blob
|
commitdiff
|
raw
next