OSDN Git Service
(root)
/
git-core
/
git.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge branch 'ls/p4-keep-empty-commits' into maint
[git-core/git.git]
/
merge-recursive.c
2015-12-15
Junio C Hamano
Merge branch 'ls/p4-keep-empty-commits' into maint
blob
|
commitdiff
2015-12-15
Junio C Hamano
Merge branch 'jk/prune-mtime' into maint
blob
|
commitdiff
2015-12-11
Junio C Hamano
Merge branch 'sn/null-pointer-arith-in-mark-tree-uninte...
blob
|
commitdiff
2015-12-11
Junio C Hamano
Merge branch 'cb/t3404-shellquote' into maint
blob
|
commitdiff
2015-12-11
Junio C Hamano
Merge branch 'sb/doc-submodule-sync-recursive' into...
blob
|
commitdiff
2015-12-11
Junio C Hamano
Merge branch 'nd/doc-check-ref-format-typo' into maint
blob
|
commitdiff
2015-12-11
Junio C Hamano
Merge branch 'rs/show-branch-argv-array' into maint
blob
|
commitdiff
2015-12-11
Junio C Hamano
Merge branch 'rs/pop-commit' into maint
blob
|
commitdiff
2015-12-11
Junio C Hamano
Merge branch 'as/subtree-with-spaces' into maint
blob
|
commitdiff
2015-12-11
Junio C Hamano
Merge branch 'jk/test-lint-forbid-when-finished-in...
blob
|
commitdiff
2015-12-08
Junio C Hamano
Merge branch 'ad/sha1-update-chunked' into maint
blob
|
commitdiff
2015-12-08
Junio C Hamano
Merge branch 'jk/interpret-trailers-outside-a-repositor...
blob
|
commitdiff
2015-12-08
Junio C Hamano
Merge branch 'jk/rebase-no-autostash' into maint
blob
|
commitdiff
2015-12-04
Junio C Hamano
Merge branch 'da/difftool' into maint
blob
|
commitdiff
2015-12-04
Junio C Hamano
Merge branch 'dk/gc-idx-wo-pack' into maint
blob
|
commitdiff
2015-12-01
Jeff King
Merge branch 'eg/p4-submit-catch-failure' into maint
blob
|
commitdiff
2015-12-01
Jeff King
Merge branch 'ld/p4-detached-head' into maint
blob
|
commitdiff
2015-12-01
Jeff King
Merge branch 'pt/http-socks-proxy' into maint
blob
|
commitdiff
2015-12-01
Jeff King
Merge branch 'rc/configure-use-libs-when-checking-a...
blob
|
commitdiff
2015-11-05
Junio C Hamano
Merge branch 'rs/daemon-plug-child-leak' into maint
blob
|
commitdiff
2015-11-05
Junio C Hamano
Merge branch 'rs/wt-status-detached-branch-fix' into...
blob
|
commitdiff
2015-11-05
Junio C Hamano
Merge branch 'jk/initialization-fix-to-add-submodule...
blob
|
commitdiff
2015-11-05
Junio C Hamano
Merge branch 'js/misc-fixes' into maint
blob
|
commitdiff
2015-11-05
Junio C Hamano
Merge branch 'jc/add-u-A-default-to-top' into maint
blob
|
commitdiff
2015-11-05
Junio C Hamano
Merge branch 'jk/delete-modechange-conflict' into maint
blob
|
commitdiff
2015-11-05
Junio C Hamano
Merge branch 'sa/send-email-smtp-batch-data-limit'...
blob
|
commitdiff
|
diff to current
2015-11-04
Junio C Hamano
Merge branch 'xf/user-manual-ff' into maint
blob
|
commitdiff
|
diff to current
2015-11-04
Junio C Hamano
Merge branch 'xf/user-manual-markup' into maint
blob
|
commitdiff
|
diff to current
2015-11-04
Junio C Hamano
Merge branch 'jc/everyday-markup' into maint
blob
|
commitdiff
|
diff to current
2015-11-04
Junio C Hamano
Merge branch 'jc/em-dash-in-doc' into maint
blob
|
commitdiff
|
diff to current
2015-11-04
Junio C Hamano
Merge branch 'es/worktree-add' into maint
blob
|
commitdiff
|
diff to current
2015-11-03
Junio C Hamano
Merge branch 'mk/blame-error-message' into maint
blob
|
commitdiff
|
diff to current
2015-11-03
Junio C Hamano
Merge branch 'jk/merge-file-exit-code' into maint
blob
|
commitdiff
|
diff to current
2015-11-03
Junio C Hamano
Merge branch 'dt/name-hash-dir-entry-fix' into maint
blob
|
commitdiff
|
diff to current
2015-11-03
Junio C Hamano
Merge branch 'nd/gc-auto-background-fix' into maint
blob
|
commitdiff
|
diff to current
2015-11-03
Junio C Hamano
Merge branch 'gr/rebase-i-drop-warn' into maint
blob
|
commitdiff
|
diff to current
2015-10-26
Jeff King
merge: detect delete/modechange conflict
blob
|
commitdiff
|
diff to current
2015-10-20
Junio C Hamano
Merge branch 'jc/doc-gc-prune-now' into maint
blob
|
commitdiff
|
diff to current
2015-10-20
Junio C Hamano
Merge branch 'jk/filter-branch-use-of-sed-on-incomplete...
blob
|
commitdiff
|
diff to current
2015-10-16
Junio C Hamano
Merge branch 'es/worktree-add-cleanup' into maint
blob
|
commitdiff
|
diff to current
2015-10-16
Junio C Hamano
Merge branch 'tk/doc-interpret-trailers-grammo' into...
blob
|
commitdiff
|
diff to current
2015-10-16
Junio C Hamano
Merge branch 'jk/asciidoctor-section-heading-markup...
blob
|
commitdiff
|
diff to current
2015-10-16
Junio C Hamano
Merge branch 'sb/http-flaky-test-fix' into maint
blob
|
commitdiff
|
diff to current
2015-10-16
Junio C Hamano
Merge branch 'gr/rebase-i-drop-warn' into maint
blob
|
commitdiff
|
diff to current
2015-10-16
Junio C Hamano
Merge branch 'jk/make-findstring-makeflags-fix' into...
blob
|
commitdiff
|
diff to current
2015-10-16
Junio C Hamano
Merge branch 'jw/make-arflags-customizable' into maint
blob
|
commitdiff
|
diff to current
2015-09-28
Junio C Hamano
Sync with 2.3.10
blob
|
commitdiff
|
diff to current
2015-09-17
Junio C Hamano
Merge branch 'po/doc-branch-desc'
blob
|
commitdiff
|
diff to current
2015-09-17
Junio C Hamano
Merge branch 'as/config-doc-markup-fix'
blob
|
commitdiff
|
diff to current
2015-09-17
Junio C Hamano
Merge branch 'br/svn-doc-include-paths-config' into...
blob
|
commitdiff
|
diff to current
2015-09-17
Junio C Hamano
Merge branch 'ah/submodule-typofix-in-error' into maint
blob
|
commitdiff
|
diff to current
2015-09-14
Junio C Hamano
Merge branch 'sg/help-group'
blob
|
commitdiff
|
diff to current
2015-09-14
Junio C Hamano
Merge git://ozlabs.org/~paulus/gitk
blob
|
commitdiff
|
diff to current
2015-09-14
Junio C Hamano
Merge branch 'mp/t7060-diff-index-test'
blob
|
commitdiff
|
diff to current
2015-09-14
Junio C Hamano
Merge branch 'gb/apply-comment-typofix'
blob
|
commitdiff
|
diff to current
2015-09-04
Junio C Hamano
Sync with 2.3.9
blob
|
commitdiff
|
diff to current
2015-09-04
Junio C Hamano
Sync with 2.2.3
blob
|
commitdiff
|
diff to current
2015-09-04
Junio C Hamano
Merge branch 'ee/clean-test-fixes' into maint
blob
|
commitdiff
|
diff to current
2015-09-04
Junio C Hamano
Merge branch 'cc/trailers-corner-case-fix' into maint
blob
|
commitdiff
|
diff to current
2015-09-04
Junio C Hamano
Merge branch 'sg/t3020-typofix' into maint
blob
|
commitdiff
|
diff to current
2015-09-04
Junio C Hamano
Merge branch 'as/docfix-reflog-expire-unreachable'...
blob
|
commitdiff
|
diff to current
2015-09-04
Junio C Hamano
Merge branch 'jk/fix-alias-pager-config-key-warnings...
blob
|
commitdiff
|
diff to current
2015-09-04
Junio C Hamano
Merge branch 'nd/dwim-wildcards-as-pathspecs' into...
blob
|
commitdiff
|
diff to current
2015-09-04
Junio C Hamano
Merge branch 'sg/help-group' into maint
blob
|
commitdiff
|
diff to current
2015-09-04
Junio C Hamano
Merge branch 'jh/strbuf-read-use-read-in-full' into...
blob
|
commitdiff
|
diff to current
2015-09-04
Junio C Hamano
Merge branch 'cb/open-noatime-clear-errno' into maint
blob
|
commitdiff
|
diff to current
2015-09-04
Junio C Hamano
Merge branch 'mh/get-remote-group-fix' into maint
blob
|
commitdiff
|
diff to current
2015-09-02
Junio C Hamano
Merge branch 'cc/trailers-corner-case-fix'
blob
|
commitdiff
|
diff to current
2015-09-02
Junio C Hamano
Merge branch 'ee/clean-test-fixes'
blob
|
commitdiff
|
diff to current
2015-09-01
Junio C Hamano
Merge branch 'ah/submodule-typofix-in-error'
blob
|
commitdiff
|
diff to current
2015-09-01
Junio C Hamano
Merge branch 'ah/reflog-typofix-in-error'
blob
|
commitdiff
|
diff to current
2015-09-01
Junio C Hamano
Merge branch 'ah/read-tree-usage-string'
blob
|
commitdiff
|
diff to current
2015-09-01
Junio C Hamano
Merge branch 'ah/pack-objects-usage-strings'
blob
|
commitdiff
|
diff to current
2015-09-01
Junio C Hamano
Merge branch 'br/svn-doc-include-paths-config'
blob
|
commitdiff
|
diff to current
2015-08-31
Junio C Hamano
Merge branch 'sg/describe-contains'
blob
|
commitdiff
|
diff to current
2015-08-31
Junio C Hamano
Merge branch 'jk/fix-alias-pager-config-key-warnings'
blob
|
commitdiff
|
diff to current
2015-08-31
Junio C Hamano
Merge branch 'sg/config-name-only'
blob
|
commitdiff
|
diff to current
2015-08-28
Junio C Hamano
Merge branch 'cc/trailers-corner-case-fix'
blob
|
commitdiff
|
diff to current
2015-08-26
Junio C Hamano
Merge branch 'sg/help-group'
blob
|
commitdiff
|
diff to current
2015-08-26
Junio C Hamano
Merge branch 'as/docfix-reflog-expire-unreachable'
blob
|
commitdiff
|
diff to current
2015-08-26
Junio C Hamano
Merge branch 'sg/t3020-typofix'
blob
|
commitdiff
|
diff to current
2015-08-25
Junio C Hamano
Merge branch 'jk/test-with-x' into maint
blob
|
commitdiff
|
diff to current
2015-08-25
Junio C Hamano
Merge branch 'sb/check-return-from-read-ref' into maint
blob
|
commitdiff
|
diff to current
2015-08-25
Junio C Hamano
Merge branch 'cb/open-noatime-clear-errno'
blob
|
commitdiff
|
diff to current
2015-08-25
Junio C Hamano
Merge branch 'dt/notes-multiple'
blob
|
commitdiff
|
diff to current
2015-08-25
Junio C Hamano
Merge branch 'nd/dwim-wildcards-as-pathspecs'
blob
|
commitdiff
|
diff to current
2015-08-25
Junio C Hamano
Merge branch 'jh/strbuf-read-use-read-in-full'
blob
|
commitdiff
|
diff to current
2015-08-19
Junio C Hamano
Merge branch 'jc/finalize-temp-file'
blob
|
commitdiff
|
diff to current
2015-08-19
Junio C Hamano
Merge branch 'jk/test-with-x'
blob
|
commitdiff
|
diff to current
2015-08-19
Junio C Hamano
Merge branch 'sb/check-return-from-read-ref'
blob
|
commitdiff
|
diff to current
2015-08-19
Junio C Hamano
Merge branch 'ta/docfix-index-format-tech' into maint
blob
|
commitdiff
|
diff to current
2015-08-19
Junio C Hamano
Merge branch 'sb/remove-unused-var-from-builtin-add...
blob
|
commitdiff
|
diff to current
2015-08-19
Junio C Hamano
Merge branch 'kn/tag-doc-fix' into maint
blob
|
commitdiff
|
diff to current
2015-08-19
Junio C Hamano
Merge branch 'es/doc-clean-outdated-tools' into maint
blob
|
commitdiff
|
diff to current
2015-08-19
Junio C Hamano
Merge branch 'nd/export-worktree' into maint
blob
|
commitdiff
|
diff to current
2015-08-19
Junio C Hamano
Merge branch 'se/doc-checkout-ours-theirs' into maint
blob
|
commitdiff
|
diff to current
2015-08-19
Junio C Hamano
Merge branch 'cb/uname-in-untracked' into maint
blob
|
commitdiff
|
diff to current
2015-08-19
Junio C Hamano
Merge branch 'as/sparse-checkout-removal' into maint
blob
|
commitdiff
|
diff to current
2015-08-19
Junio C Hamano
Merge branch 'jx/do-not-crash-receive-pack-wo-head...
blob
|
commitdiff
|
diff to current
2015-08-17
Junio C Hamano
Merge branch 'ta/docfix-index-format-tech'
blob
|
commitdiff
|
diff to current
next