Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
rebase: prepare reset_head() for more flags
[gitweb.git]
/
git-mergetool--lib.sh
2018-11-06
Merge branch 'sg/test-verbose-log'
blob
|
diff
|
raw
2018-11-06
Merge branch 'rj/header-cleanup'
blob
|
diff
|
raw
2018-11-06
Merge branch 'ss/travis-ci-force-vm-mode'
blob
|
diff
|
raw
2018-11-06
Merge branch 'sg/test-rebase-editor-fix'
blob
|
diff
|
raw
2018-11-06
Merge branch 'tb/char-may-be-unsigned'
blob
|
diff
|
raw
2018-11-06
Merge branch 'js/mingw-ns-filetime'
blob
|
diff
|
raw
2018-11-06
Merge branch 'md/exclude-promisor-objects-fix'
blob
|
diff
|
raw
2018-11-06
Merge branch 'jw/send-email-no-auth'
blob
|
diff
|
raw
2018-11-06
Merge branch 'nd/submodule-unused-vars'
blob
|
diff
|
raw
2018-11-06
Merge branch 'nd/unpack-trees-with-cache-tree'
blob
|
diff
|
raw
2018-11-06
Merge branch 'nd/completion-negation'
blob
|
diff
|
raw
2018-11-06
Merge branch 'jt/upload-pack-v2-fix-shallow'
blob
|
diff
|
raw
2018-11-06
Merge branch 'sb/submodule-url-to-absolute'
blob
|
diff
|
raw
2018-11-06
Merge branch 'js/shallow-and-fetch-prune'
blob
|
diff
|
raw
2018-11-06
Merge branch 'js/remote-archive-dwimfix'
blob
|
diff
|
raw
2018-11-02
Merge branch 'jc/http-curlver-warnings'
blob
|
diff
|
raw
2018-11-02
Merge branch 'js/mingw-http-ssl'
blob
|
diff
|
raw
2018-11-02
Merge branch 'mg/gpg-fingerprint'
blob
|
diff
|
raw
2018-11-02
Merge branch 'mg/gpg-parse-tighten'
blob
|
diff
|
raw
2018-11-02
Merge branch 'en/merge-cleanup-more'
blob
|
diff
|
raw
2018-11-02
Merge branch 'js/rebase-i-shortopt'
blob
|
diff
|
raw
2018-11-02
Merge branch 'js/rebase-i-break'
blob
|
diff
|
raw
2018-11-02
Merge branch 'js/rebase-autostash-fix'
blob
|
diff
|
raw
2018-11-02
Merge branch 'cb/printf-empty-format'
blob
|
diff
|
raw
2018-11-02
Merge branch 'jc/rebase-in-c-5-test-typofix'
blob
|
diff
|
raw
2018-11-02
Merge branch 'pk/rebase-in-c-6-final'
blob
|
diff
|
raw
2018-11-02
Merge branch 'js/rebase-in-c-5.5-work-with-rebase-i...
blob
|
diff
|
raw
2018-11-02
Merge branch 'pk/rebase-in-c-5-test'
blob
|
diff
|
raw
2018-11-02
Merge branch 'pk/rebase-in-c-4-opts'
blob
|
diff
|
raw
2018-11-02
Merge branch 'pk/rebase-in-c-3-acts'
blob
|
diff
|
raw
2018-11-02
Merge branch 'pk/rebase-in-c-2-basic'
blob
|
diff
|
raw
2018-11-02
Merge branch 'ag/rebase-i-in-c'
blob
|
diff
|
raw
2018-11-02
Merge branch 'pk/rebase-in-c'
blob
|
diff
|
raw
2018-10-30
Merge branch 'jk/uploadpack-packobjectshook-fix'
blob
|
diff
|
raw
2018-10-30
Merge branch 'uk/merge-subtree-doc-update'
blob
|
diff
|
raw
2018-10-30
Merge branch 'cb/compat-mmap-is-private-read-only'
blob
|
diff
|
raw
2018-10-30
Merge branch 'dl/mergetool-gui-option'
blob
|
diff
|
raw
2018-10-25
mergetool: accept -g/--[no-]gui as arguments
blob
|
diff
|
raw
2018-10-16
Merge branch 'jk/check-everything-connected-is-long...
blob
|
diff
|
raw
|
diff to current
2018-08-27
Merge branch 'sg/t7501-thinkofix'
blob
|
diff
|
raw
|
diff to current
2018-08-27
Merge branch 'sg/t0020-conversion-fix'
blob
|
diff
|
raw
|
diff to current
2018-08-27
Merge branch 'sg/t4051-fix'
blob
|
diff
|
raw
|
diff to current
2018-08-20
Merge branch 'js/typofixes'
blob
|
diff
|
raw
|
diff to current
2018-08-15
Merge branch 'sb/histogram-less-memory'
blob
|
diff
|
raw
|
diff to current
2018-05-30
Merge branch 'rs/no-null-ptr-arith-in-fast-export'
blob
|
diff
|
raw
|
diff to current
2018-05-08
Merge branch 'ab/git-svn-get-record-typofix'
blob
|
diff
|
raw
|
diff to current
2018-04-25
Merge branch 'js/t5404-path-fix'
blob
|
diff
|
raw
|
diff to current
2018-04-25
Merge branch 'mn/send-email-credential-doc'
blob
|
diff
|
raw
|
diff to current
2018-04-25
Merge branch 'ak/bisect-doc-typofix'
blob
|
diff
|
raw
|
diff to current
2018-03-22
Merge branch 'sb/status-doc-fix' into maint
blob
|
diff
|
raw
|
diff to current
2018-03-22
Merge branch 'cl/t9001-cleanup' into maint
blob
|
diff
|
raw
|
diff to current
2018-03-22
Merge branch 'nd/diff-flush-before-warning' into maint
blob
|
diff
|
raw
|
diff to current
2018-03-21
Merge branch 'dp/merge-strategy-doc-fix'
blob
|
diff
|
raw
|
diff to current
2018-03-08
Merge branch 'mk/doc-pretty-fill'
blob
|
diff
|
raw
|
diff to current
2018-03-06
Merge branch 'cb/ttk-style' of git-gui into cb/git...
blob
|
diff
|
raw
|
diff to current
2018-03-02
Merge branch 'bb/ssh-key-files' of git-gui into bb...
blob
|
diff
|
raw
|
diff to current
2018-03-02
Merge branch 'bp/bind-kp-enter' of git-gui into bp...
blob
|
diff
|
raw
|
diff to current
2018-02-28
Merge branch 'tz/do-not-clean-spec-file'
blob
|
diff
|
raw
|
diff to current
2018-02-28
Merge branch 'sb/status-doc-fix'
blob
|
diff
|
raw
|
diff to current
2018-02-27
Merge branch 'bp/name-hash-dirname-fix'
blob
|
diff
|
raw
|
diff to current
2018-02-15
Merge branch 'as/read-tree-prefix-doc-fix' into maint
blob
|
diff
|
raw
|
diff to current
2018-02-13
Merge branch 'nd/diff-flush-before-warning'
blob
|
diff
|
raw
|
diff to current
2018-02-13
Merge branch 'cl/t9001-cleanup'
blob
|
diff
|
raw
|
diff to current
2018-01-23
Merge branch 'as/read-tree-prefix-doc-fix'
blob
|
diff
|
raw
|
diff to current
2018-01-09
Merge branch 'js/misc-git-gui-stuff' of ../git-gui
blob
|
diff
|
raw
|
diff to current
2017-12-28
Merge branch 'sr/http-sslverify-config-doc'
blob
|
diff
|
raw
|
diff to current
2017-12-27
Merge branch 'es/clone-shared-worktree'
blob
|
diff
|
raw
|
diff to current
2017-12-27
Merge branch 'jk/cvsimport-quoting'
blob
|
diff
|
raw
|
diff to current
2017-12-27
Merge branch 'rs/am-builtin-leakfix'
blob
|
diff
|
raw
|
diff to current
2017-12-05
Merge branch 'ls/no-double-utf8-author-name' of .....
blob
|
diff
|
raw
|
diff to current
2017-11-22
Merge branch 'jn/reproducible-build' of ../git-gui...
blob
|
diff
|
raw
|
diff to current
2017-11-09
Merge branch 'tz/fsf-address-update' of ../git-gui...
blob
|
diff
|
raw
|
diff to current
2017-11-06
Merge branch 'ex/deprecate-empty-pathspec-as-match...
blob
|
diff
|
raw
|
diff to current
2017-10-28
Merge branch 'sg/rev-list-doc-reorder-fix'
blob
|
diff
|
raw
|
diff to current
2017-10-23
Merge branch 'jc/fetch-refspec-doc-update' into maint
blob
|
diff
|
raw
|
diff to current
2017-10-19
Merge branch 'jc/fetch-refspec-doc-update'
blob
|
diff
|
raw
|
diff to current
2017-10-18
Merge branch 'ma/pkt-line-leakfix' into maint
blob
|
diff
|
raw
|
diff to current
2017-10-18
Merge branch 'jc/merge-x-theirs-docfix' into maint
blob
|
diff
|
raw
|
diff to current
2017-10-18
Merge branch 'rs/mailinfo-qp-decode-fix' into maint
blob
|
diff
|
raw
|
diff to current
2017-10-18
Merge branch 'jk/describe-omit-some-refs' into maint
blob
|
diff
|
raw
|
diff to current
2017-10-18
Merge branch 'aw/gc-lockfile-fscanf-fix' into maint
blob
|
diff
|
raw
|
diff to current
2017-09-28
Merge branch 'jc/merge-x-theirs-docfix'
blob
|
diff
|
raw
|
diff to current
2017-09-28
Merge branch 'rs/mailinfo-qp-decode-fix'
blob
|
diff
|
raw
|
diff to current
2017-09-28
Merge branch 'jk/describe-omit-some-refs'
blob
|
diff
|
raw
|
diff to current
2017-09-25
Merge branch 'aw/gc-lockfile-fscanf-fix'
blob
|
diff
|
raw
|
diff to current
2017-09-22
Sync with 2.10.5
blob
|
diff
|
raw
|
diff to current
2017-09-20
Merge branch 'jk/describe-omit-some-refs' into mk/descr...
blob
|
diff
|
raw
|
diff to current
2017-09-19
Merge branch 'ma/pkt-line-leakfix'
blob
|
diff
|
raw
|
diff to current
2017-09-10
Merge branch 'jt/doc-pack-objects-fix' into maint
blob
|
diff
|
raw
|
diff to current
2017-09-10
Merge branch 'jn/vcs-svn-cleanup' into maint
blob
|
diff
|
raw
|
diff to current
2017-09-10
Merge branch 'bc/vcs-svn-cleanup' into maint
blob
|
diff
|
raw
|
diff to current
2017-09-10
Merge branch 'sb/sha1-file-cleanup' into maint
blob
|
diff
|
raw
|
diff to current
2017-09-10
Merge branch 'rs/t1002-do-not-use-sum' into maint
blob
|
diff
|
raw
|
diff to current
2017-09-10
Merge branch 'rs/find-pack-entry-bisection' into maint
blob
|
diff
|
raw
|
diff to current
2017-09-10
Merge branch 'rj/add-chmod-error-message' into maint
blob
|
diff
|
raw
|
diff to current
2017-09-10
Merge branch 'rs/t3700-clean-leftover' into maint
blob
|
diff
|
raw
|
diff to current
2017-09-10
Merge branch 'jc/perl-git-comment-typofix' into maint
blob
|
diff
|
raw
|
diff to current
2017-09-10
Merge branch 'rs/t4062-obsd' into maint
blob
|
diff
|
raw
|
diff to current
2017-08-27
Merge branch 'jt/doc-pack-objects-fix'
blob
|
diff
|
raw
|
diff to current
2017-08-27
Merge branch 'jn/vcs-svn-cleanup'
blob
|
diff
|
raw
|
diff to current
next