projects
/
git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge tag 'l10n-2.14.0-rnd2' of git://github.com/git-l10n/git-po
[git]
/
builtin
/
merge-recursive.c
2017-07-31
Junio C Hamano
Merge branch 'rs/apply-avoid-over-reading' into maint
blob
|
commitdiff
|
raw
2017-07-21
Junio C Hamano
Merge branch 'ks/fix-rebase-doc-picture' into maint
blob
|
commitdiff
|
raw
2017-07-12
Junio C Hamano
Merge branch 'ks/fix-rebase-doc-picture'
blob
|
commitdiff
|
raw
2017-07-12
Junio C Hamano
Merge branch 'rs/apply-avoid-over-reading'
blob
|
commitdiff
|
raw
2017-07-10
Junio C Hamano
Merge branch 'jc/utf8-fprintf' into maint
blob
|
commitdiff
|
raw
2017-07-10
Junio C Hamano
Merge branch 'js/fsck-name-object' into maint
blob
|
commitdiff
|
raw
2017-07-10
Junio C Hamano
Merge branch 'mb/reword-autocomplete-message' into...
blob
|
commitdiff
|
raw
2017-07-10
Junio C Hamano
Merge branch 'ks/t7508-indent-fix' into maint
blob
|
commitdiff
|
raw
2017-07-10
Junio C Hamano
Merge branch 'sb/t4005-modernize' into maint
blob
|
commitdiff
|
raw
2017-07-10
Junio C Hamano
Merge branch 'jc/pack-bitmap-unaligned' into maint
blob
|
commitdiff
|
raw
2017-07-10
Junio C Hamano
Merge branch 'rs/pretty-add-again' into maint
blob
|
commitdiff
|
raw
2017-07-07
Junio C Hamano
Merge branch 'rs/apply-avoid-over-reading'
blob
|
commitdiff
|
raw
2017-07-07
Junio C Hamano
Merge branch 'jc/utf8-fprintf'
blob
|
commitdiff
|
raw
2017-07-07
Junio C Hamano
Merge branch 'js/fsck-name-object'
blob
|
commitdiff
|
raw
2017-06-30
Junio C Hamano
Merge branch 'jc/pack-bitmap-unaligned'
blob
|
commitdiff
|
raw
2017-06-26
Junio C Hamano
Merge branch 'mb/reword-autocomplete-message'
blob
|
commitdiff
|
raw
2017-06-26
Junio C Hamano
Merge branch 'ks/t7508-indent-fix'
blob
|
commitdiff
|
raw
2017-06-24
Junio C Hamano
Merge branch 'km/test-mailinfo-b-failure' into maint
blob
|
commitdiff
|
raw
2017-06-24
Junio C Hamano
Merge branch 'jc/diff-tree-stale-comment' into maint
blob
|
commitdiff
|
raw
2017-06-24
Junio C Hamano
Merge branch 'jk/pack-idx-corruption-safety' into maint
blob
|
commitdiff
|
raw
2017-06-24
Junio C Hamano
Merge branch 'rs/pretty-add-again'
blob
|
commitdiff
|
raw
2017-06-24
Junio C Hamano
Merge branch 'ab/wildmatch-glob-slash-test'
blob
|
commitdiff
|
raw
2017-06-22
Junio C Hamano
Merge branch 'km/test-mailinfo-b-failure'
blob
|
commitdiff
|
raw
2017-06-22
Junio C Hamano
Merge branch 'sb/t4005-modernize'
blob
|
commitdiff
|
raw
2017-06-13
Junio C Hamano
Merge branch 'jk/pack-idx-corruption-safety'
blob
|
commitdiff
|
raw
2017-06-13
Junio C Hamano
Merge branch 'jc/diff-tree-stale-comment'
blob
|
commitdiff
|
raw
2017-06-13
Junio C Hamano
Merge branch 'ab/t3070-test-dedup' into maint
blob
|
commitdiff
|
raw
2017-06-05
Junio C Hamano
Merge branch 'ah/doc-filter-branch-export-env' into...
blob
|
commitdiff
|
raw
2017-06-05
Junio C Hamano
Merge branch 'sd/t3200-typofix' into maint
blob
|
commitdiff
|
raw
2017-06-05
Junio C Hamano
Merge branch 'sg/core-filemode-doc-typofix' into maint
blob
|
commitdiff
|
raw
2017-06-05
Junio C Hamano
Merge branch 'js/bs-is-a-dir-sep-on-windows' into maint
blob
|
commitdiff
|
raw
2017-06-04
Junio C Hamano
Merge branch 'jk/ignore-broken-tags-when-ignoring-missi...
blob
|
commitdiff
|
raw
2017-06-04
Junio C Hamano
Merge branch 'jc/read-tree-empty-with-m' into maint
blob
|
commitdiff
|
raw
2017-06-04
Junio C Hamano
Merge branch 'ab/t3070-test-dedup'
blob
|
commitdiff
|
raw
2017-06-04
Junio C Hamano
Merge branch 'ah/doc-filter-branch-export-env'
blob
|
commitdiff
|
raw
2017-06-04
Junio C Hamano
Merge branch 'sd/t3200-typofix'
blob
|
commitdiff
|
raw
2017-06-02
Junio C Hamano
Merge branch 'js/bs-is-a-dir-sep-on-windows'
blob
|
commitdiff
|
raw
2017-05-29
Junio C Hamano
Merge branch 'jk/ignore-broken-tags-when-ignoring-missi...
blob
|
commitdiff
|
raw
2017-05-29
Junio C Hamano
Merge branch 'sg/core-filemode-doc-typofix'
blob
|
commitdiff
|
raw
2017-05-29
Junio C Hamano
Merge branch 'jc/read-tree-empty-with-m'
blob
|
commitdiff
|
raw
2017-05-29
Junio C Hamano
Merge branch 'jk/diff-submodule-diff-inline'
blob
|
commitdiff
|
raw
2017-05-05
Junio C Hamano
Merge branch 'maint-2.10' into maint-2.11
blob
|
commitdiff
|
raw
2017-05-05
Junio C Hamano
Merge branch 'maint-2.9' into maint-2.10
blob
|
commitdiff
|
raw
|
diff to current
2017-05-05
Junio C Hamano
Merge branch 'maint-2.6' into maint-2.7
blob
|
commitdiff
|
raw
|
diff to current
2017-05-01
Junio C Hamano
Merge branch 'jk/submodule-init-segv-fix'
blob
|
commitdiff
|
raw
2017-05-01
Junio C Hamano
Merge branch 'jk/prio-queue-avoid-swap-with-self'
blob
|
commitdiff
|
raw
2017-04-24
Junio C Hamano
Merge branch 'dt/xgethostname-nul-termination'
blob
|
commitdiff
|
raw
2017-04-24
Junio C Hamano
Merge branch 'xy/format-patch-base'
blob
|
commitdiff
|
raw
2017-04-20
Junio C Hamano
Merge branch 'vn/revision-shorthand-for-side-branch...
blob
|
commitdiff
|
raw
2017-04-17
Junio C Hamano
Merge branch 'jc/bs-t-is-not-a-tab-for-sed'
blob
|
commitdiff
|
raw
2017-04-17
Junio C Hamano
Merge branch 'jc/unused-symbols'
blob
|
commitdiff
|
raw
2017-04-11
Junio C Hamano
Merge branch 'cc/untracked'
blob
|
commitdiff
|
raw
2017-03-30
Junio C Hamano
Merge branch 'bc/push-cert-receive-fix'
blob
|
commitdiff
|
raw
2017-03-30
Junio C Hamano
Merge branch 'jc/merge-drop-old-syntax'
blob
|
commitdiff
|
raw
2017-03-28
Junio C Hamano
Merge branch 'sg/skip-prefix-in-prettify-refname'
blob
|
commitdiff
|
raw
2017-03-28
Junio C Hamano
Merge branch 'km/config-grammofix' into maint
blob
|
commitdiff
|
raw
2017-03-28
Junio C Hamano
Merge branch 'sb/submodule-update-initial-runs-custom...
blob
|
commitdiff
|
raw
2017-03-28
Junio C Hamano
Merge branch 'rs/update-hook-optim' into maint
blob
|
commitdiff
|
raw
2017-03-28
Junio C Hamano
Merge branch 'rs/path-name-safety-cleanup' into maint
blob
|
commitdiff
|
raw
2017-03-28
Junio C Hamano
Merge branch 'rs/http-push-cleanup' into maint
blob
|
commitdiff
|
raw
2017-03-28
Junio C Hamano
Merge branch 'rs/blame-code-cleanup' into maint
blob
|
commitdiff
|
raw
2017-03-28
Junio C Hamano
Merge branch 'js/regexec-buf' into maint
blob
|
commitdiff
|
raw
2017-03-27
Junio C Hamano
Merge branch 'km/config-grammofix'
blob
|
commitdiff
|
raw
2017-03-27
Junio C Hamano
Merge branch 'sb/submodule-update-initial-runs-custom...
blob
|
commitdiff
|
raw
2017-03-24
Junio C Hamano
Merge branch 'rs/update-hook-optim'
blob
|
commitdiff
|
raw
2017-03-24
Junio C Hamano
Merge branch 'rs/path-name-safety-cleanup'
blob
|
commitdiff
|
raw
2017-03-24
Junio C Hamano
Merge branch 'rs/http-push-cleanup'
blob
|
commitdiff
|
raw
2017-03-24
Junio C Hamano
Merge branch 'js/regexec-buf'
blob
|
commitdiff
|
raw
2017-03-24
Junio C Hamano
Merge branch 'jc/config-case-cmdline-take-2' into maint
blob
|
commitdiff
|
raw
2017-03-24
Junio C Hamano
Merge branch 'sb/submodule-config-parse-ignore-fix...
blob
|
commitdiff
|
raw
2017-03-21
Junio C Hamano
Merge branch 'sb/submodule-config-parse-ignore-fix'
blob
|
commitdiff
|
raw
2017-03-21
Junio C Hamano
Merge branch 'rs/commit-parsing-optim' into maint
blob
|
commitdiff
|
raw
2017-03-21
Junio C Hamano
Merge branch 'jk/show-branch-lift-name-len-limit' into...
blob
|
commitdiff
|
raw
2017-03-21
Junio C Hamano
Merge branch 'jk/tempfile-ferror-fclose-confusion'...
blob
|
commitdiff
|
raw
2017-03-21
Junio C Hamano
Merge branch 'rs/sha1-file-plug-fallback-base-leak...
blob
|
commitdiff
|
raw
2017-03-21
Junio C Hamano
Merge branch 'jc/diff-populate-filespec-size-only-fix...
blob
|
commitdiff
|
raw
2017-03-21
Junio C Hamano
Merge branch 'mg/status-porcelain-no-i18n' into maint
blob
|
commitdiff
|
raw
2017-03-21
Junio C Hamano
Merge branch 'jk/ewah-use-right-type-in-sizeof' into...
blob
|
commitdiff
|
raw
2017-03-17
Junio C Hamano
Merge branch 'jk/cherry-pick-0-mainline'
blob
|
commitdiff
|
raw
2017-03-17
Junio C Hamano
Merge branch 'mg/status-porcelain-no-i18n'
blob
|
commitdiff
|
raw
2017-03-17
Junio C Hamano
Merge branch 'rs/blame-code-cleanup'
blob
|
commitdiff
|
raw
2017-03-16
Junio C Hamano
Merge branch 'vn/line-log-memcpy-size-fix' into maint
blob
|
commitdiff
|
raw
2017-03-16
Junio C Hamano
Merge branch 'ax/line-log-range-merge-fix' into maint
blob
|
commitdiff
|
raw
2017-03-13
Junio C Hamano
Merge branch 'jc/diff-populate-filespec-size-only-fix'
blob
|
commitdiff
|
raw
2017-03-13
Junio C Hamano
Merge branch 'vn/line-log-memcpy-size-fix'
blob
|
commitdiff
|
raw
2017-03-13
Junio C Hamano
Merge branch 'jk/ewah-use-right-type-in-sizeof'
blob
|
commitdiff
|
raw
2017-03-13
Junio C Hamano
Merge branch 'ax/line-log-range-merge-fix'
blob
|
commitdiff
|
raw
2017-03-10
Junio C Hamano
Merge branch 'rs/sha1-file-plug-fallback-base-leak'
blob
|
commitdiff
|
raw
2017-03-10
Junio C Hamano
Merge branch 'rs/commit-parsing-optim'
blob
|
commitdiff
|
raw
2017-03-10
Junio C Hamano
Merge branch 'jc/config-case-cmdline-take-2'
blob
|
commitdiff
|
raw
2017-02-27
Junio C Hamano
Merge branch 'jk/tempfile-ferror-fclose-confusion'
blob
|
commitdiff
|
raw
2017-02-27
Junio C Hamano
Merge branch 'jk/show-branch-lift-name-len-limit'
blob
|
commitdiff
|
raw
2017-02-24
Junio C Hamano
Merge branch 'bc/worktree-doc-fix-detached'
blob
|
commitdiff
|
raw
2017-02-24
Junio C Hamano
Merge branch 'rt/align-add-i-help-text'
blob
|
commitdiff
|
raw
2017-02-24
Junio C Hamano
Merge branch 'bc/blame-doc-fix'
blob
|
commitdiff
|
raw
2017-02-16
Junio C Hamano
Merge branch 'jk/tempfile-ferror-fclose-confusion'
blob
|
commitdiff
|
raw
2017-02-16
Junio C Hamano
Merge branch 'dp/submodule-doc-markup-fix'
blob
|
commitdiff
|
raw
2017-02-16
Junio C Hamano
Merge branch 'js/mingw-isatty'
blob
|
commitdiff
|
raw
2017-02-16
Junio C Hamano
Merge branch 'ls/p4-path-encoding'
blob
|
commitdiff
|
raw
2017-02-15
Junio C Hamano
Merge branch 'jk/doc-remote-helpers-markup-fix'
blob
|
commitdiff
|
raw
next