Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
Merge branch 'sb/submodule-path-misc-bugs'
[gitweb.git]
/
Documentation
/
git-merge.txt
2016-04-25
Merge branch 'sb/submodule-path-misc-bugs'
blob
|
diff
|
raw
2016-04-25
Merge branch 'dt/pre-refs-backend'
blob
|
diff
|
raw
2016-04-25
Merge branch 'jc/rerere-multi'
blob
|
diff
|
raw
2016-04-22
Merge branch 'ad/cygwin-wants-rename'
blob
|
diff
|
raw
2016-04-22
Merge branch 'jk/use-write-script-more'
blob
|
diff
|
raw
2016-04-22
Merge branch 'jk/do-not-printf-NULL'
blob
|
diff
|
raw
2016-04-22
Merge branch 'jc/http-socks5h'
blob
|
diff
|
raw
2016-04-22
Merge branch 'ky/imap-send-openssl-1.1.0'
blob
|
diff
|
raw
2016-04-22
Merge branch 'ky/imap-send'
blob
|
diff
|
raw
2016-04-22
Merge branch 'jc/xstrfmt-null-with-prec-0'
blob
|
diff
|
raw
2016-04-22
Merge branch 'ad/commit-have-m-option'
blob
|
diff
|
raw
2016-04-22
Merge branch 'ew/send-email-drop-data-dumper'
blob
|
diff
|
raw
2016-04-22
Merge branch 'ew/send-email-readable-message-id'
blob
|
diff
|
raw
2016-04-22
Merge branch 'sb/submodule-helper-clone-regression...
blob
|
diff
|
raw
2016-04-18
Merge branch 'jk/branch-shortening-funny-symrefs'
blob
|
diff
|
raw
2016-04-18
Merge branch 'ky/branch-m-worktree'
blob
|
diff
|
raw
2016-04-15
Merge branch 'maint'
blob
|
diff
|
raw
2016-04-15
Merge branch 'ss/commit-squash-msg' into maint
blob
|
diff
|
raw
|
diff to current
2016-04-15
Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codep...
blob
|
diff
|
raw
|
diff to current
2016-04-15
Merge branch 'pb/t7502-drop-dup' into maint
blob
|
diff
|
raw
|
diff to current
2016-04-15
Merge branch 'ss/exc-flag-is-a-collection-of-bits'...
blob
|
diff
|
raw
|
diff to current
2016-04-13
Merge branch 'tb/blame-force-read-cache-to-workaround...
blob
|
diff
|
raw
2016-04-13
Merge branch 'mg/complete-cherry-mark-to-log'
blob
|
diff
|
raw
2016-04-13
Merge branch 'ep/trace-doc-sample-fix'
blob
|
diff
|
raw
2016-04-13
Merge branch 'jc/makefile-redirection-stderr'
blob
|
diff
|
raw
2016-04-13
Merge branch 'lt/pretty-expand-tabs'
blob
|
diff
|
raw
2016-04-13
Merge branch 'mj/pull-rebase-autostash'
blob
|
diff
|
raw
2016-04-13
Merge branch 'jn/mergetools-examdiff'
blob
|
diff
|
raw
2016-04-13
Merge branch 'es/format-patch-doc-hide-no-patch'
blob
|
diff
|
raw
2016-04-13
Merge branch 'js/mingw-tests-2.8'
blob
|
diff
|
raw
2016-04-13
Merge branch 'cc/apply'
blob
|
diff
|
raw
2016-04-13
Merge branch 'sb/misc-cleanups'
blob
|
diff
|
raw
2016-04-13
Merge branch 'sk/send-pack-all-fix'
blob
|
diff
|
raw
2016-04-13
Merge branch 'sg/diff-multiple-identical-renames'
blob
|
diff
|
raw
2016-04-13
Merge branch 'kn/for-each-tag-branch'
blob
|
diff
|
raw
2016-04-13
Merge branch 'ky/branch-d-worktree'
blob
|
diff
|
raw
2016-04-13
Merge branch 'rz/worktree-no-checkout'
blob
|
diff
|
raw
2016-04-13
Merge branch 'rt/rebase-i-shorten-stop-report'
blob
|
diff
|
raw
2016-04-13
Merge branch 'rt/completion-help'
blob
|
diff
|
raw
2016-04-13
Merge branch 'ak/use-hashmap-iter-first-in-submodule...
blob
|
diff
|
raw
2016-04-13
Merge branch 'jk/check-repository-format'
blob
|
diff
|
raw
2016-04-08
Merge branch 'ss/msvc'
blob
|
diff
|
raw
2016-04-08
Merge branch 'oa/doc-diff-check'
blob
|
diff
|
raw
2016-04-08
Merge branch 'pb/opt-cmdmode-doc'
blob
|
diff
|
raw
2016-04-08
Merge branch 'nd/apply-report-skip'
blob
|
diff
|
raw
2016-04-08
Merge branch 'nd/apply-doc'
blob
|
diff
|
raw
2016-04-08
Merge branch 'jc/merge-refuse-new-root'
blob
|
diff
|
raw
2016-04-06
Merge branch 'ss/commit-squash-msg'
blob
|
diff
|
raw
|
diff to current
2016-04-06
Merge branch 'pb/t7502-drop-dup'
blob
|
diff
|
raw
|
diff to current
2016-04-06
Merge branch 'ss/exc-flag-is-a-collection-of-bits'
blob
|
diff
|
raw
|
diff to current
2016-04-03
Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath'
blob
|
diff
|
raw
|
diff to current
2016-04-03
Merge branch 'jc/maint-index-pack-keep'
blob
|
diff
|
raw
|
diff to current
2016-03-23
merge: refuse to create too cool a merge by default
blob
|
diff
|
raw
2016-03-21
Merge branch 'mm/doc-hooks-linkgit-fix' into maint
blob
|
diff
|
raw
|
diff to current
2016-03-21
Merge branch 'es/st-add4-gcc-4.2-workaround' into maint
blob
|
diff
|
raw
|
diff to current
2016-03-21
Merge branch 'master' of git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
|
diff to current
2016-03-17
Merge branch 'maint-2.5' into maint-2.6
blob
|
diff
|
raw
|
diff to current
2016-03-17
Merge branch 'maint-2.4' into maint-2.5
blob
|
diff
|
raw
|
diff to current
2016-03-16
Merge branch 'jk/path-name-safety-2.5' into jk/path...
blob
|
diff
|
raw
|
diff to current
2016-03-16
Merge branch 'jk/path-name-safety-2.4' into jk/path...
blob
|
diff
|
raw
|
diff to current
2016-03-14
Merge branch 'mg/wt-status-mismarked-i18n'
blob
|
diff
|
raw
|
diff to current
2016-03-10
Merge branch 'ma/update-hooks-sample-typofix' into...
blob
|
diff
|
raw
|
diff to current
2016-03-10
Merge branch 'ak/git-strip-extension-from-dashed-comman...
blob
|
diff
|
raw
|
diff to current
2016-03-10
Merge branch 'ak/extract-argv0-last-dir-sep' into maint
blob
|
diff
|
raw
|
diff to current
2016-03-10
Merge branch 'jk/pack-idx-corruption-safety' into maint
blob
|
diff
|
raw
|
diff to current
2016-03-10
Merge branch 'jk/grep-binary-workaround-in-test' into...
blob
|
diff
|
raw
|
diff to current
2016-03-10
Merge branch 'mm/push-simple-doc' into maint
blob
|
diff
|
raw
|
diff to current
2016-03-10
Merge branch 'jk/more-comments-on-textconv' into maint
blob
|
diff
|
raw
|
diff to current
2016-03-10
Merge branch 'jk/no-diff-emit-common' into maint
blob
|
diff
|
raw
|
diff to current
2016-03-10
Merge branch 'jc/am-i-v-fix' into maint
blob
|
diff
|
raw
|
diff to current
2016-03-10
Merge branch 'nd/dwim-wildcards-as-pathspecs' into...
blob
|
diff
|
raw
|
diff to current
2016-03-10
Merge branch 'mg/work-tree-tests' into maint
blob
|
diff
|
raw
|
diff to current
2016-03-04
Merge branch 'nd/clear-gitenv-upon-use-of-alias'
blob
|
diff
|
raw
|
diff to current
2016-03-04
Merge branch 'jk/pack-idx-corruption-safety'
blob
|
diff
|
raw
|
diff to current
2016-03-03
Merge branch 'jc/maint-index-pack-keep' into jc/index...
blob
|
diff
|
raw
|
diff to current
2016-02-26
Merge branch 'ma/update-hooks-sample-typofix'
blob
|
diff
|
raw
|
diff to current
2016-02-26
Merge branch 'jk/grep-binary-workaround-in-test'
blob
|
diff
|
raw
|
diff to current
2016-02-26
Merge branch 'mm/push-simple-doc'
blob
|
diff
|
raw
|
diff to current
2016-02-26
Merge branch 'mg/work-tree-tests'
blob
|
diff
|
raw
|
diff to current
2016-02-26
Merge branch 'jk/more-comments-on-textconv'
blob
|
diff
|
raw
|
diff to current
2016-02-26
Merge branch 'jk/no-diff-emit-common'
blob
|
diff
|
raw
|
diff to current
2016-02-26
Merge branch 'ak/git-strip-extension-from-dashed-command'
blob
|
diff
|
raw
|
diff to current
2016-02-26
Merge branch 'ak/extract-argv0-last-dir-sep'
blob
|
diff
|
raw
|
diff to current
2016-02-24
Merge branch 'jc/am-i-v-fix'
blob
|
diff
|
raw
|
diff to current
2016-02-24
Merge branch 'nd/dwim-wildcards-as-pathspecs'
blob
|
diff
|
raw
|
diff to current
2016-02-22
Merge branch 'js/git-remote-add-url-insteadof-test'
blob
|
diff
|
raw
|
diff to current
2016-02-22
Merge branch 'jk/config-include'
blob
|
diff
|
raw
|
diff to current
2016-02-22
Merge branch 'nd/ita-cleanup' into maint
blob
|
diff
|
raw
|
diff to current
2016-02-17
Merge branch 'jk/rerere-xsnprintf'
blob
|
diff
|
raw
|
diff to current
2016-02-17
Merge branch 'nd/clear-gitenv-upon-use-of-alias'
blob
|
diff
|
raw
|
diff to current
2016-02-10
Merge branch 'wp/sha1-name-negative-match'
blob
|
diff
|
raw
|
diff to current
2016-02-05
Merge branch 'lv/add-doc-working-tree' into maint
blob
|
diff
|
raw
|
diff to current
2016-02-05
Merge branch 'ss/clone-depth-single-doc' into maint
blob
|
diff
|
raw
|
diff to current
2016-02-05
Merge branch 'sg/t6050-failing-editor-test-fix' into...
blob
|
diff
|
raw
|
diff to current
2016-02-05
Merge branch 'ew/for-each-ref-doc' into maint
blob
|
diff
|
raw
|
diff to current
2016-02-05
Merge branch 'ss/user-manual' into maint
blob
|
diff
|
raw
|
diff to current
2016-02-05
Merge branch 'tb/complete-word-diff-regex' into maint
blob
|
diff
|
raw
|
diff to current
2016-02-05
Merge branch 'jk/sanity' into maint
blob
|
diff
|
raw
|
diff to current
2016-02-05
Merge branch 'jk/ok-to-fail-gc-auto-in-rebase' into...
blob
|
diff
|
raw
|
diff to current
2016-02-05
Merge branch 'ho/gitweb-squelch-undef-warning' into...
blob
|
diff
|
raw
|
diff to current
next