Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jk/parseopt-usage-msg-opt' into maint
[gitweb.git]
/
Documentation
/
git-mergetool.txt
2017-01-17
Merge branch 'jk/parseopt-usage-msg-opt' into maint
blob
|
diff
|
raw
2017-01-17
Merge branch 'jk/quote-env-path-list-component' into...
blob
|
diff
|
raw
2017-01-17
Merge branch 'nd/shallow-fixup' into maint
blob
|
diff
|
raw
2017-01-17
Merge branch 'jc/pull-rebase-ff' into maint
blob
|
diff
|
raw
2017-01-17
Merge branch 'js/normalize-path-copy-ceil' into maint
blob
|
diff
|
raw
2017-01-17
Merge branch 'ak/commit-only-allow-empty' into maint
blob
|
diff
|
raw
2017-01-17
Merge branch 'da/difftool-dir-diff-fix' into maint
blob
|
diff
|
raw
2017-01-17
Merge branch 'jk/stash-disable-renames-internally'...
blob
|
diff
|
raw
2017-01-17
Merge branch 'jk/http-walker-limit-redirect' into maint
blob
|
diff
|
raw
2017-01-17
Merge branch 'jc/renormalize-merge-kill-safer-crlf...
blob
|
diff
|
raw
2017-01-17
Merge branch 'da/mergetool-trust-exit-code' into maint
blob
|
diff
|
raw
2017-01-17
Merge branch 'bw/push-dry-run' into maint
blob
|
diff
|
raw
2017-01-17
Merge branch 'hv/submodule-not-yet-pushed-fix' into...
blob
|
diff
|
raw
2017-01-17
Merge branch 'jk/rev-parse-symbolic-parents-fix' into...
blob
|
diff
|
raw
2017-01-17
Merge branch 'js/mingw-isatty' into maint
blob
|
diff
|
raw
2017-01-17
Merge branch 'bb/unicode-9.0' into maint
blob
|
diff
|
raw
2016-12-05
Sync with maint-2.10
blob
|
diff
|
raw
2016-11-29
Merge branch 'jk/common-main'
blob
|
diff
|
raw
2016-11-23
Merge branch 'jt/trailer-with-cruft'
blob
|
diff
|
raw
2016-11-23
Merge branch 'js/rebase-i-commentchar-fix'
blob
|
diff
|
raw
2016-11-23
Merge branch 'jc/for-each-ref-head-segfault-fix'
blob
|
diff
|
raw
2016-11-22
Merge branch 'js/prepare-sequencer'
blob
|
diff
|
raw
2016-11-17
Merge branch 'tk/diffcore-delta-remove-unused'
blob
|
diff
|
raw
2016-11-17
Merge branch 'jk/create-branch-remove-unused-param'
blob
|
diff
|
raw
2016-11-17
Merge branch 'nd/worktree-lock'
blob
|
diff
|
raw
2016-11-11
Merge branch 'ps/common-info-doc'
blob
|
diff
|
raw
2016-11-11
Merge branch 'ls/macos-update'
blob
|
diff
|
raw
2016-11-11
Merge branch 'js/prepare-sequencer'
blob
|
diff
|
raw
2016-11-11
Merge branch 'ls/filter-process'
blob
|
diff
|
raw
2016-11-11
Merge branch 'as/merge-attr-sleep'
blob
|
diff
|
raw
2016-11-10
Merge branch 'jk/alt-odb-cleanup'
blob
|
diff
|
raw
2016-11-10
Merge branch 'jk/filter-process-fix'
blob
|
diff
|
raw
2016-11-10
Merge branch 'ls/filter-process'
blob
|
diff
|
raw
2016-11-02
Merge branch 'russian-l10n' of https://github.com/DJm00...
blob
|
diff
|
raw
2016-11-01
Merge branch 'rs/cocci'
blob
|
diff
|
raw
2016-10-31
Merge branch 'nd/test-helpers'
blob
|
diff
|
raw
2016-10-31
Merge branch 'sc/fmt-merge-msg-doc-markup-fix'
blob
|
diff
|
raw
2016-10-31
Merge branch 'ak/sh-setup-dot-source-i18n-fix'
blob
|
diff
|
raw
2016-10-31
Merge branch 'rs/commit-pptr-simplify'
blob
|
diff
|
raw
2016-10-31
Merge branch 'jk/rebase-config-insn-fmt-docfix'
blob
|
diff
|
raw
2016-10-31
Merge branch 'ak/pre-receive-hook-template-modefix'
blob
|
diff
|
raw
2016-10-31
Merge branch 'jk/common-main'
blob
|
diff
|
raw
2016-10-31
Merge branch 'jt/trailer-with-cruft'
blob
|
diff
|
raw
2016-10-31
Merge branch 'ls/filter-process'
blob
|
diff
|
raw
2016-10-31
Merge branch 'ls/git-open-cloexec'
blob
|
diff
|
raw
2016-10-28
Sync with 2.10.2
blob
|
diff
|
raw
2016-10-27
Merge branch 'svn-wt' of git://bogomips.org/git-svn
blob
|
diff
|
raw
2016-10-27
Merge branch 'nd/ita-empty-commit'
blob
|
diff
|
raw
2016-10-27
Merge branch 'js/prepare-sequencer'
blob
|
diff
|
raw
2016-10-27
Merge branch 'jk/daemon-path-ok-check-truncation'
blob
|
diff
|
raw
2016-10-27
Merge branch 'rs/ring-buffer-wraparound'
blob
|
diff
|
raw
2016-10-27
Merge branch 'sb/submodule-ignore-trailing-slash'
blob
|
diff
|
raw
2016-10-27
Merge branch 'jc/abbrev-auto'
blob
|
diff
|
raw
2016-10-27
Merge branch 'jk/abbrev-auto'
blob
|
diff
|
raw
2016-10-27
Merge branch 'lt/abbrev-auto'
blob
|
diff
|
raw
2016-10-26
Merge branch 'ex/deprecate-empty-pathspec-as-match...
blob
|
diff
|
raw
2016-10-26
Merge branch 'po/fix-doc-merge-base-illustration'
blob
|
diff
|
raw
2016-10-26
Merge branch 'jk/tap-verbose-fix'
blob
|
diff
|
raw
2016-10-26
Merge branch 'mm/send-email-cc-cruft-after-address'
blob
|
diff
|
raw
2016-10-26
Merge branch 'yk/git-tag-remove-mention-of-old-layout...
blob
|
diff
|
raw
2016-10-26
Merge branch 'jk/diff-submodule-diff-inline'
blob
|
diff
|
raw
2016-10-26
Merge branch 'tg/add-chmod+x-fix'
blob
|
diff
|
raw
2016-10-26
Merge branch 'bw/submodule-branch-dot-doc'
blob
|
diff
|
raw
2016-10-26
Merge branch 'pb/test-parse-options-expect'
blob
|
diff
|
raw
2016-10-26
Merge branch 'jk/tighten-alloc'
blob
|
diff
|
raw
2016-10-26
Merge branch 'va/i18n'
blob
|
diff
|
raw
2016-10-26
Merge branch 'jk/fetch-quick-tag-following'
blob
|
diff
|
raw
2016-10-26
Merge branch 'jk/merge-base-fork-point-without-reflog'
blob
|
diff
|
raw
2016-10-26
Merge branch 'jk/ambiguous-short-object-names'
blob
|
diff
|
raw
2016-10-26
Merge branch 'jk/upload-pack-use-prio-queue'
blob
|
diff
|
raw
2016-10-26
Merge branch 'ab/gitweb-abbrev-links'
blob
|
diff
|
raw
2016-10-26
Merge branch 'dk/worktree-dup-checkout-with-bare-is-ok'
blob
|
diff
|
raw
2016-10-26
Merge branch 'mg/gpg-richer-status'
blob
|
diff
|
raw
2016-10-26
Merge branch 'jc/cocci-xstrdup-or-null'
blob
|
diff
|
raw
2016-10-26
Merge branch 'mm/credential-libsecret'
blob
|
diff
|
raw
2016-10-26
Merge branch 'bw/ls-files-recurse-submodules'
blob
|
diff
|
raw
2016-10-26
Merge branch 'js/libify-require-clean-work-tree'
blob
|
diff
|
raw
2016-10-26
Merge branch 'jc/ws-error-highlight'
blob
|
diff
|
raw
2016-10-26
Merge branch 'jc/diff-unique-abbrev-comments'
blob
|
diff
|
raw
2016-10-20
Merge tag 'gitgui-0.21.0' of git://repo.or.cz/git-gui
blob
|
diff
|
raw
2016-10-17
Sync with maint
blob
|
diff
|
raw
2016-10-17
Merge branch 'sb/submodule-config-doc-drop-path'
blob
|
diff
|
raw
2016-10-17
Merge branch 'rs/pretty-format-color-doc-fix'
blob
|
diff
|
raw
2016-10-17
Merge branch 'js/reset-usage'
blob
|
diff
|
raw
2016-10-17
Merge branch 'da/mergetool-diff-order'
blob
|
diff
|
raw
2016-10-11
mergetool: honor -O<orderfile>
blob
|
diff
|
raw
2016-10-11
mergetool: honor diff.orderFile
blob
|
diff
|
raw
|
diff to current
2016-09-29
Merge branch 'mr/vcs-svn-printf-ulong' into maint
blob
|
diff
|
raw
|
diff to current
2016-09-26
Merge branch 'va/i18n' of ../git-gui into va/git-gui...
blob
|
diff
|
raw
|
diff to current
2016-09-26
Merge branch 'rs/use-modern-git-merge-syntax' of git...
blob
|
diff
|
raw
|
diff to current
2016-09-21
Merge branch 'mr/vcs-svn-printf-ulong'
blob
|
diff
|
raw
|
diff to current
2016-09-11
Merge branch 'js/commit-gpgsign' of ../git-gui into...
blob
|
diff
|
raw
|
diff to current
2016-09-09
Merge branch 'ls/packet-line-protocol-doc-fix' into...
blob
|
diff
|
raw
|
diff to current
2016-09-07
Merge branch 'sy/i18n' of git-gui
blob
|
diff
|
raw
|
diff to current
2016-08-31
Merge branch 'ls/packet-line-protocol-doc-fix'
blob
|
diff
|
raw
|
diff to current
2016-08-03
Merge branch 'jk/git-jump'
blob
|
diff
|
raw
|
diff to current
2016-07-28
Merge branch 'js/t3404-grammo-fix' into maint
blob
|
diff
|
raw
|
diff to current
2016-07-13
Merge branch 'js/t3404-grammo-fix'
blob
|
diff
|
raw
|
diff to current
2016-07-11
Merge branch 'cb/t7810-test-label-fix' into maint
blob
|
diff
|
raw
|
diff to current
2016-07-06
Merge branch 'cb/t7810-test-label-fix'
blob
|
diff
|
raw
|
diff to current
next