cherry-pick/revert: add scissors line on merge conflict
[gitweb.git] / Documentation / git-ls-remote.txt
2018-05-30 Merge branch 'jk/unavailable-can-be-missing'
2018-05-30 Merge branch 'bp/status-rename-config'
2018-05-30 Merge branch 'js/use-bug-macro'
2018-05-30 Merge branch 'rs/no-null-ptr-arith-in-fast-export'
2018-05-30 Merge branch 'nd/repo-clear-keep-the-index'
2018-05-30 Merge branch 'ma/lockfile-cleanup'
2018-05-30 Merge branch 'sg/t6500-no-redirect-of-stdin'
2018-05-30 Merge branch 'bp/merge-rename-config'
2018-05-30 Merge branch 'js/sequencer-and-root-commits'
2018-05-30 Merge branch 'dd/send-email-reedit'
2018-05-29 Sync with Git 2.17.1
2018-05-29 Merge branch 'nd/command-list' into nd/complete-config...
2018-05-23 Merge branch 'fg/completion-external'
2018-05-23 Merge branch 'bc/asciidoctor-tab-width'
2018-05-23 Merge branch 'nd/pack-unreachable-objects-doc'
2018-05-23 Merge branch 'nd/completion-aliasfiletype-typofix'
2018-05-23 Merge branch 'em/status-rename-config'
2018-05-23 Merge branch 'cc/perf-bisect'
2018-05-23 Merge branch 'ah/misc-doc-updates'
2018-05-23 Merge branch 'bp/test-drop-caches'
2018-05-23 Merge branch 'en/unpack-trees-split-index-fix'
2018-05-23 Merge branch 'nd/doc-header'
2018-05-23 Merge branch 'bc/format-patch-cover-no-attach'
2018-05-23 Merge branch 'tb/test-apfs-utf8-normalization'
2018-05-23 Merge branch 'js/rebase-recreate-merge'
2018-05-23 Merge branch 'nd/pack-objects-pack-struct'
2018-05-23 Merge branch 'en/rename-directory-detection-reboot'
2018-05-23 Merge branch 'js/no-pager-shorthand'
2018-05-23 Merge branch 'js/rebase-i-clean-msg-after-fixup-continue'
2018-05-23 Merge branch 'tg/worktree-add-existing-branch'
2018-05-23 Merge branch 'js/deprecate-grafts'
2018-05-23 Merge branch 'js/test-unset-prereq'
2018-05-23 Merge branch 'ab/perl-python-attrs'
2018-05-23 Merge branch 'sb/oid-object-info'
2018-05-23 Merge branch 'cc/perf-aggregate-unknown-option'
2018-05-23 Merge branch 'en/git-debugger'
2018-05-23 Merge branch 'bw/server-options'
2018-05-23 Merge branch 'nd/repack-keep-pack'
2018-05-23 Merge branch 'ds/lazy-load-trees'
2018-05-23 Merge branch 'nd/term-columns'
2018-05-23 Merge branch 'sg/t7005-spaces-in-filenames-cleanup'
2018-05-23 Merge branch 'sg/t5516-fixes'
2018-05-23 Merge branch 'sg/t5310-jgit-bitmap-test'
2018-05-23 Merge branch 'nd/pack-format-doc'
2018-05-23 Merge branch 'jk/apply-p-doc'
2018-05-23 Merge branch 'ao/config-api-doc'
2018-05-23 Merge branch 'bc/mailmap-self'
2018-05-23 Merge branch 'sb/object-store-replace'
2018-05-08 Merge branch 'ma/http-walker-no-partial'
2018-05-08 Merge branch 'js/runtime-prefix'
2018-05-08 Merge branch 'js/colored-push-errors'
2018-05-08 Merge branch 'jc/parseopt-expiry-errors'
2018-05-08 Merge branch 'ma/fast-export-skip-merge-fix'
2018-05-08 Merge branch 'tz/doc-git-urls-reference'
2018-05-08 Merge branch 'tg/demote-stash-save-in-completion'
2018-05-08 Merge branch 'sa/send-email-dedup-some-headers'
2018-05-08 Merge branch 'nd/submodule-status-fix'
2018-05-08 Merge branch 'js/ident-date-fix'
2018-05-08 Merge branch 'bt/gpg-interface'
2018-05-08 Merge branch 'hn/sort-ls-remote'
2018-04-25 Merge branch 'ak/bisect-doc-typofix'
2018-04-24 ls-remote: send server options when using protocol v2
2018-04-09 ls-remote: create '--sort' option
2018-03-06 Merge branch 'cb/ttk-style' of git-gui into cb/git...
2018-03-02 Merge branch 'bb/ssh-key-files' of git-gui into bb...
2018-03-02 Merge branch 'bp/bind-kp-enter' of git-gui into bp...
2018-01-09 Merge branch 'js/misc-git-gui-stuff' of ../git-gui
2017-12-27 Merge branch 'es/clone-shared-worktree'
2017-12-27 Merge branch 'rs/am-builtin-leakfix'
2017-12-05 Merge branch 'ls/no-double-utf8-author-name' of .....
2017-11-22 Merge branch 'jn/reproducible-build' of ../git-gui...
2017-11-09 Merge branch 'tz/fsf-address-update' of ../git-gui...
2017-10-28 Merge branch 'sg/rev-list-doc-reorder-fix'
2017-10-23 Merge branch 'jc/fetch-refspec-doc-update' into maint
2017-10-19 Merge branch 'jc/fetch-refspec-doc-update'
2017-07-30 Merge tag 'v2.7.6' into maint-2.8
2017-07-25 Merge branch 'js/msgfmt-on-windows' of ../git-gui into...
2017-06-24 Merge branch 'jc/diff-tree-stale-comment' into maint
2017-06-24 Merge branch 'jk/pack-idx-corruption-safety' into maint
2017-06-13 Merge branch 'jk/pack-idx-corruption-safety'
2017-06-13 Merge branch 'jc/diff-tree-stale-comment'
2017-06-05 Merge branch 'sg/core-filemode-doc-typofix' into maint
2017-05-29 Merge branch 'sg/core-filemode-doc-typofix'
2017-05-05 Merge branch 'maint-2.7' into maint-2.8
2017-05-05 Merge branch 'maint-2.5' into maint-2.6
2017-05-01 Merge branch 'jk/prio-queue-avoid-swap-with-self'
2017-04-17 Merge branch 'jc/bs-t-is-not-a-tab-for-sed'
2017-04-17 Merge branch 'jc/unused-symbols'
2017-04-11 Merge branch 'cc/untracked'
2017-03-30 Merge branch 'bc/push-cert-receive-fix'
2017-03-30 Merge branch 'jc/merge-drop-old-syntax'
2017-03-28 Merge branch 'rs/path-name-safety-cleanup' into maint
2017-03-24 Merge branch 'rs/path-name-safety-cleanup'
2017-03-21 Merge branch 'jk/ewah-use-right-type-in-sizeof' into...
2017-03-13 Merge branch 'jk/ewah-use-right-type-in-sizeof'
2017-02-24 Merge branch 'bc/worktree-doc-fix-detached'
2017-02-16 Merge branch 'ls/p4-path-encoding'
2017-02-10 Merge branch 'ps/worktree-prune-help-fix'
2017-01-31 Merge branch 'ad/bisect-terms' into maint
2017-01-23 Merge branch 'ad/bisect-terms'
next