Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
Sync with Git 2.15.2
[gitweb.git]
/
git-merge-resolve.sh
2018-05-22
Sync with Git 2.13.7
blob
|
diff
|
raw
2018-03-22
Merge branch 'gs/test-unset-xdg-cache-home' into maint
blob
|
diff
|
raw
2018-03-22
Merge branch 'sb/status-doc-fix' into maint
blob
|
diff
|
raw
2018-03-22
Merge branch 'bc/doc-interpret-trailers-grammofix'...
blob
|
diff
|
raw
2018-03-22
Merge branch 'jc/mailinfo-cleanup-fix' into maint
blob
|
diff
|
raw
2018-03-22
Merge branch 'cl/t9001-cleanup' into maint
blob
|
diff
|
raw
2018-03-22
Merge branch 'jt/fsck-code-cleanup' into maint
blob
|
diff
|
raw
2018-03-22
Merge branch 'nd/diff-flush-before-warning' into maint
blob
|
diff
|
raw
2018-03-22
Merge branch 'sg/travis-build-during-script-phase'...
blob
|
diff
|
raw
2018-02-27
Merge branch 'ys/bisect-object-id-missing-conversion...
blob
|
diff
|
raw
2018-02-27
Merge branch 'nd/ita-wt-renames-in-status' into maint
blob
|
diff
|
raw
2018-02-15
Merge branch 'as/read-tree-prefix-doc-fix' into maint
blob
|
diff
|
raw
2018-01-11
Merge branch 'js/test-with-ws-in-path'
blob
|
diff
|
raw
2018-01-09
Merge branch 'jk/doc-diff-options'
blob
|
diff
|
raw
2018-01-09
Merge branch 'sg/travis-check-untracked'
blob
|
diff
|
raw
2018-01-09
Merge branch 'js/test-with-ws-in-path'
blob
|
diff
|
raw
2018-01-09
Merge branch 'sg/travis-skip-identical-test'
blob
|
diff
|
raw
2018-01-09
Merge branch 'sg/travis-fixes'
blob
|
diff
|
raw
2018-01-09
Merge branch 'js/misc-git-gui-stuff' of ../git-gui
blob
|
diff
|
raw
2018-01-05
Merge branch 'jh/memihash-opt'
blob
|
diff
|
raw
2017-12-28
Merge branch 'sr/http-sslverify-config-doc'
blob
|
diff
|
raw
2017-12-27
Merge branch 'sg/travis-fixes'
blob
|
diff
|
raw
2017-12-27
Merge branch 'es/clone-shared-worktree'
blob
|
diff
|
raw
2017-12-27
Merge branch 'jk/cvsimport-quoting'
blob
|
diff
|
raw
2017-12-27
Merge branch 'rs/strbuf-read-once-reset-length'
blob
|
diff
|
raw
2017-12-27
Merge branch 'rs/fmt-merge-msg-string-leak-fix'
blob
|
diff
|
raw
2017-12-27
Merge branch 'rs/am-builtin-leakfix'
blob
|
diff
|
raw
2017-12-19
Merge branch 'sg/setup-doc-update'
blob
|
diff
|
raw
2017-12-19
Merge branch 'bw/submodule-config-cleanup'
blob
|
diff
|
raw
2017-12-19
Merge branch 'bw/pathspec-match-submodule-boundary'
blob
|
diff
|
raw
2017-12-13
Merge branch 'ks/doc-checkout-previous'
blob
|
diff
|
raw
2017-12-13
Merge branch 'jc/receive-pack-hook-doc'
blob
|
diff
|
raw
2017-12-06
Merge branch 'sp/doc-info-attributes'
blob
|
diff
|
raw
2017-12-06
Merge branch 'rd/doc-notes-prune-fix'
blob
|
diff
|
raw
2017-12-06
Merge branch 'rd/man-reflog-add-n'
blob
|
diff
|
raw
2017-12-06
Merge branch 'rd/man-prune-progress'
blob
|
diff
|
raw
2017-12-06
Merge branch 'tz/branch-doc-remove-set-upstream'
blob
|
diff
|
raw
2017-12-06
Merge branch 'sb/submodule-recursive-checkout-detach...
blob
|
diff
|
raw
2017-12-06
Merge branch 'jc/merge-base-fork-point-doc' into maint
blob
|
diff
|
raw
2017-12-06
Merge branch 'tz/notes-error-to-stderr' into maint
blob
|
diff
|
raw
2017-12-06
Merge branch 'rs/apply-inaccurate-eof-with-incomplete...
blob
|
diff
|
raw
2017-12-06
Merge branch 'tz/complete-branch-copy' into maint
blob
|
diff
|
raw
2017-12-06
Merge branch 'sd/branch-copy' into maint
blob
|
diff
|
raw
2017-12-06
Merge branch 'sw/pull-ipv46-passthru' into maint
blob
|
diff
|
raw
2017-12-05
Merge branch 'ls/no-double-utf8-author-name' of .....
blob
|
diff
|
raw
2017-11-28
Merge branch 'ma/branch-list-paginate'
blob
|
diff
|
raw
2017-11-27
Merge branch 'sw/pull-ipv46-passthru'
blob
|
diff
|
raw
2017-11-27
Merge branch 'ks/rebase-no-git-foo'
blob
|
diff
|
raw
2017-11-27
Merge branch 'tz/complete-branch-copy'
blob
|
diff
|
raw
2017-11-27
Merge branch 'rs/apply-inaccurate-eof-with-incomplete...
blob
|
diff
|
raw
2017-11-27
Merge branch 'sd/branch-copy'
blob
|
diff
|
raw
2017-11-27
Merge branch 'tz/notes-error-to-stderr'
blob
|
diff
|
raw
2017-11-27
Merge branch 'jc/merge-base-fork-point-doc'
blob
|
diff
|
raw
2017-11-27
Merge branch 'jc/ignore-cr-at-eol'
blob
|
diff
|
raw
2017-11-27
Merge branch 'rs/apply-fuzzy-match-fix' into maint
blob
|
diff
|
raw
2017-11-27
Merge branch 'rs/imap-send-next-arg-fix' into maint
blob
|
diff
|
raw
2017-11-22
Merge branch 'jn/reproducible-build' of ../git-gui...
blob
|
diff
|
raw
2017-11-21
Merge branch 'rs/apply-fuzzy-match-fix'
blob
|
diff
|
raw
2017-11-21
Merge branch 'cb/t4201-robustify' into maint
blob
|
diff
|
raw
2017-11-21
Merge branch 'ad/rebase-i-serie-typofix' into maint
blob
|
diff
|
raw
2017-11-21
Merge branch 'ab/pcre-v2' into maint
blob
|
diff
|
raw
2017-11-21
Merge branch 'bw/rebase-i-ignored-submodule-fix' into...
blob
|
diff
|
raw
2017-11-15
Merge branch 'cb/t4201-robustify'
blob
|
diff
|
raw
2017-11-15
Merge branch 'ab/pcre-v2'
blob
|
diff
|
raw
2017-11-15
Merge branch 'ad/rebase-i-serie-typofix'
blob
|
diff
|
raw
2017-11-15
Merge branch 'bw/rebase-i-ignored-submodule-fix'
blob
|
diff
|
raw
2017-11-15
Merge branch 'ao/merge-verbosity-getenv-just-once'
blob
|
diff
|
raw
2017-11-15
Merge branch 'rs/imap-send-next-arg-fix'
blob
|
diff
|
raw
2017-11-15
Merge branch 'dk/libsecret-unlock-to-load-fix' into...
blob
|
diff
|
raw
2017-11-15
Merge branch 'js/early-config' into maint
blob
|
diff
|
raw
2017-11-15
Merge branch 'ao/diff-populate-filespec-lstat-errorpath...
blob
|
diff
|
raw
2017-11-15
Merge branch 'jc/check-ref-format-oor' into maint
blob
|
diff
|
raw
2017-11-15
Merge branch 'jk/rebase-i-exec-gitdir-fix' into maint
blob
|
diff
|
raw
2017-11-15
Merge branch 'bw/grep-recurse-submodules' into maint
blob
|
diff
|
raw
2017-11-15
Merge branch 'js/submodule-in-excluded' into maint
blob
|
diff
|
raw
2017-11-15
Merge branch 'kd/auto-col-with-pager-fix' into maint
blob
|
diff
|
raw
2017-11-15
Merge branch 'sg/travis-fixes' into maint
blob
|
diff
|
raw
2017-11-09
Merge branch 'dk/libsecret-unlock-to-load-fix'
blob
|
diff
|
raw
2017-11-09
Merge branch 'js/early-config'
blob
|
diff
|
raw
2017-11-09
Merge branch 'sg/travis-fixes'
blob
|
diff
|
raw
2017-11-09
Merge branch 'ao/diff-populate-filespec-lstat-errorpath...
blob
|
diff
|
raw
2017-11-09
Merge branch 'tz/fsf-address-update' of ../git-gui...
blob
|
diff
|
raw
2017-11-06
Merge branch 'jc/check-ref-format-oor'
blob
|
diff
|
raw
2017-11-06
Merge branch 'jk/revision-pruning-optim'
blob
|
diff
|
raw
2017-11-06
Merge branch 'ex/deprecate-empty-pathspec-as-match...
blob
|
diff
|
raw
2017-11-06
Merge branch 'jk/rebase-i-exec-gitdir-fix'
blob
|
diff
|
raw
2017-11-06
Merge branch 'bw/grep-recurse-submodules'
blob
|
diff
|
raw
2017-11-06
Merge branch 'js/submodule-in-excluded'
blob
|
diff
|
raw
2017-11-06
Merge branch 'kd/auto-col-with-pager-fix'
blob
|
diff
|
raw
2017-10-28
Merge branch 'sg/rev-list-doc-reorder-fix'
blob
|
diff
|
raw
2017-10-28
Merge branch 'sb/rev-parse-show-superproject-root'
blob
|
diff
|
raw
2017-10-28
Merge branch 'ao/path-use-xmalloc'
blob
|
diff
|
raw
2017-10-23
Merge branch 'jc/fetch-refspec-doc-update' into maint
blob
|
diff
|
raw
2017-10-23
Merge branch 'ma/ts-cleanups' into maint
blob
|
diff
|
raw
2017-10-23
Merge branch 'ls/travis-scriptify' into maint
blob
|
diff
|
raw
2017-10-23
Merge branch 'jt/fast-export-copy-modify-fix' into...
blob
|
diff
|
raw
2017-10-23
Merge branch 'nd/worktree-kill-parse-ref' into maint
blob
|
diff
|
raw
2017-10-19
Merge branch 'jc/fetch-refspec-doc-update'
blob
|
diff
|
raw
2017-10-18
Merge branch 'rs/qsort-s' into maint
blob
|
diff
|
raw
2017-10-18
Merge branch 'mr/doc-negative-pathspec' into maint
blob
|
diff
|
raw
next