cherry-pick/revert: add scissors line on merge conflict
[gitweb.git] / Documentation / git-get-tar-commit-id.txt
2015-12-01 Merge branch 'ld/p4-detached-head' into maint
2015-12-01 Merge branch 'pt/http-socks-proxy' into maint
2015-12-01 Merge branch 'rc/configure-use-libs-when-checking-a...
2015-11-25 Merge branch 'fp/subtree-todo-update'
2015-11-25 Merge branch 'rc/configure-use-libs-when-checking-a...
2015-11-20 Merge branch 'dk/gc-idx-wo-pack'
2015-11-05 Merge branch 'ea/checkout-progress'
2015-11-05 Merge branch 'rs/daemon-plug-child-leak' into maint
2015-11-05 Merge branch 'rs/wt-status-detached-branch-fix' into...
2015-11-05 Merge branch 'jk/initialization-fix-to-add-submodule...
2015-11-05 Merge branch 'js/misc-fixes' into maint
2015-11-05 Merge branch 'jc/add-u-A-default-to-top' into maint
2015-11-05 Merge branch 'jk/delete-modechange-conflict' into maint
2015-11-05 Merge branch 'js/imap-send-curl-compilation-fix' into...
2015-11-05 Merge branch 'rp/link-curl-before-ssl' into maint
2015-11-05 Merge branch 'nd/clone-linked-checkout' into maint
2015-11-05 Merge branch 'sa/send-email-smtp-batch-data-limit'...
2015-11-04 Merge branch 'xf/user-manual-ff' into maint
2015-11-04 Merge branch 'xf/user-manual-markup' into maint
2015-11-04 Merge branch 'jc/everyday-markup' into maint
2015-11-04 Merge branch 'jc/em-dash-in-doc' into maint
2015-11-04 Merge branch 'es/worktree-add' into maint
2015-11-03 Merge branch 'mk/blame-error-message' into maint
2015-11-03 Merge branch 'jk/merge-file-exit-code' into maint
2015-11-03 Merge branch 'dt/name-hash-dir-entry-fix' into maint
2015-11-03 Merge branch 'jc/am-3-fallback-regression-fix' into...
2015-11-03 Merge branch 'jc/usage-stdin' into maint
2015-11-03 Merge branch 'rs/daemon-plug-child-leak'
2015-11-03 Merge branch 'mk/blame-first-parent'
2015-11-03 Merge branch 'rs/wt-status-detached-branch-fix'
2015-11-03 Merge branch 'rs/show-branch-argv-array'
2015-11-03 Merge branch 'jk/initialization-fix-to-add-submodule...
2015-11-03 Merge branch 'da/difftool'
2015-11-03 Merge branch 'jc/mailinfo-lib'
2015-11-03 Merge branch 'kn/for-each-branch'
2015-10-30 Merge branch 'jk/merge-file-exit-code'
2015-10-30 Merge branch 'gr/rebase-i-drop-warn'
2015-10-30 Merge branch 'xf/user-manual-ff'
2015-10-30 Merge branch 'rs/pop-commit'
2015-10-30 Merge branch 'mk/blame-error-message'
2015-10-30 Merge branch 'js/misc-fixes'
2015-10-30 Merge branch 'js/imap-send-curl-compilation-fix'
2015-10-30 Merge branch 'jk/delete-modechange-conflict'
2015-10-30 Merge branch 'jc/add-u-A-default-to-top'
2015-10-30 Merge branch 'ar/clone-dissociate'
2015-10-30 Merge git://ozlabs.org/~paulus/gitk
2015-10-29 Merge branch 'jc/am-mailinfo-direct'
2015-10-29 Merge branch 'jc/mailinfo-lib'
2015-10-29 Merge branch 'rp/link-curl-before-ssl'
2015-10-29 Merge branch 'dt/name-hash-dir-entry-fix'
2015-10-29 Merge branch 'tk/sigchain-unnecessary-post-tempfile'
2015-10-29 Merge branch 'jk/war-on-sprintf'
2015-10-29 Merge branch 'jc/em-dash-in-doc'
2015-10-29 Merge branch 'jc/everyday-markup'
2015-10-29 Merge branch 'xf/user-manual-markup'
2015-10-26 Merge branch 'dk/p4-import-ctypes'
2015-10-26 Merge branch 'jk/repository-extension'
2015-10-26 Merge branch 'dt/t7063-fix-flaky-test'
2015-10-26 Merge branch 'kn/for-each-tag'
2015-10-26 Merge branch 'es/worktree-add'
2015-10-26 Merge branch 'tk/stripspace'
2015-10-26 Merge branch 'rt/placeholder-in-usage'
2015-10-26 Merge branch 'jc/usage-stdin'
2015-10-16 usage: do not insist that standard input must come...
2015-10-16 Merge branch 'jk/make-findstring-makeflags-fix' into...
2015-10-05 Merge branch 'jk/make-findstring-makeflags-fix'
2015-09-14 Merge git://ozlabs.org/~paulus/gitk
2015-09-14 Merge branch 'mp/t7060-diff-index-test'
2015-09-14 Merge branch 'gb/apply-comment-typofix'
2015-09-04 Merge branch 'sg/t3020-typofix' into maint
2015-08-26 Merge branch 'sg/t3020-typofix'
2015-06-16 Merge branch 'mc/commit-doc-grammofix' into maint
2015-06-01 Merge branch 'mc/commit-doc-grammofix'
2015-05-26 Merge branch 'sg/complete-decorate-full-not-long' into...
2015-05-11 Merge branch 'sg/complete-decorate-full-not-long'
2015-04-19 Merge tag 'gitgui-0.20.0' of repo.or.cz/r/git-gui
2015-03-24 Merge branch 'master' of git://ozlabs.org/~paulus/gitk
2015-03-05 Merge branch 'sb/hex-object-name-is-at-most-41-bytes...
2015-02-25 Merge branch 'sb/hex-object-name-is-at-most-41-bytes...
2015-02-25 Merge branch 'jk/remote-curl-an-array-in-struct-cannot...
2015-02-17 Merge branch 'jk/remote-curl-an-array-in-struct-cannot...
2015-01-12 Merge branch 'rw/apply-does-not-take-ignore-date' into...
2015-01-07 Merge branch 'sb/t5400-remove-unused'
2014-12-22 Merge branch 'rw/apply-does-not-take-ignore-date'
2014-10-30 Merge git://ozlabs.org/~paulus/gitk
2014-10-29 Merge branch 'bc/asciidoc-pretty-formats-fix' into...
2014-10-14 Merge branch 'bc/asciidoc-pretty-formats-fix'
2014-09-30 Merge branch 'sb/merge-recursive-copy-paste-fix'
2014-09-26 Merge branch 'sb/help-unknown-command-sort-fix'
2014-08-10 Merge branch 'master' of git://ozlabs.org/~paulus/gitk
2014-06-27 Merge git://ozlabs.org/~paulus/gitk
2014-06-26 Merge early parts from git://ozlabs.org/~paulus/gitk.git
2014-06-26 Merge git://repo.or.cz/git-gui
2014-05-19 Merge branch 'jl/use-vsatisfy-correctly-for-2.0'
2014-01-23 Merge git://ozlabs.org/~paulus/gitk
2014-01-21 Merge tag 'gitgui-0.19.0' of repo.or.cz/r/git-gui
2014-01-14 Merge branch 'jc/maint-pull-docfix-for-409b8d82' into...
2013-12-09 Merge git://repo.or.cz/git-gui
2013-12-09 Merge git://ozlabs.org/~paulus/gitk
2013-11-07 Merge branch 'vd/doc-unpack-objects' into maint
next