Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first
⋅
prev
⋅
next
commit
grep
author
committer
pickaxe
?
re
merge-recursive: make "CONFLICT (rename/delete)" message show both paths
[gitweb.git]
/
t
/
t3310-notes-merge-manual-resolve.sh
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 '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 '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 'rs/cocci'
blob
|
diff
|
raw
2016-10-17
Merge branch 'js/regexec-buf'
blob
|
diff
|
raw
2016-10-17
Merge branch 'jk/ref-symlink-loop'
blob
|
diff
|
raw
2016-10-17
Merge branch 'nd/commit-p-doc'
blob
|
diff
|
raw
2016-10-17
Merge branch 'jk/clone-copy-alternates-fix'
blob
|
diff
|
raw
2016-10-17
Merge branch 'dt/http-empty-auth'
blob
|
diff
|
raw
2016-10-16
Merge branch 'russian-l10n' of https://github.com/DJm00...
blob
|
diff
|
raw
|
diff to current
2016-10-11
Sync with maint
blob
|
diff
|
raw
2016-10-11
Merge branch 'jk/verify-packfile-gently' into maint
blob
|
diff
|
raw
|
diff to current
2016-10-11
Merge branch 'jc/verify-loose-object-header' into maint
blob
|
diff
|
raw
|
diff to current
2016-10-11
Merge branch 'rs/git-gui-use-modern-git-merge-syntax...
blob
|
diff
|
raw
|
diff to current
2016-10-11
Merge branch 'pb/rev-list-reverse-with-count' into...
blob
|
diff
|
raw
|
diff to current
2016-10-11
Merge branch 'jk/graph-padding-fix' into maint
blob
|
diff
|
raw
|
diff to current
2016-10-10
Merge branch 'jc/blame-reverse'
blob
|
diff
|
raw
2016-10-10
Merge branch 'nd/shallow-deepen'
blob
|
diff
|
raw
2016-10-10
Merge branch 'cp/completion-negative-refs'
blob
|
diff
|
raw
2016-10-10
Merge branch 'dp/autoconf-curl-ssl'
blob
|
diff
|
raw
2016-10-10
Merge branch 'ak/curl-imap-send-explicit-scheme'
blob
|
diff
|
raw
2016-10-10
Merge branch 'jk/pack-objects-optim-mru'
blob
|
diff
|
raw
2016-10-06
Merge branch 'sg/ref-filter-parse-optim'
blob
|
diff
|
raw
2016-10-06
Merge branch 'rs/cocci'
blob
|
diff
|
raw
2016-10-06
Merge branch 'rs/c-auto-resets-attributes'
blob
|
diff
|
raw
2016-10-06
Merge branch 'ps/http-gssapi-cred-delegation'
blob
|
diff
|
raw
2016-10-06
Merge branch 'jk/graph-padding-fix'
blob
|
diff
|
raw
2016-10-06
Merge branch 'vn/revision-shorthand-for-side-branch...
blob
|
diff
|
raw
2016-10-06
Merge branch 'jc/blame-abbrev'
blob
|
diff
|
raw
2016-10-06
Merge branch 'jk/ambiguous-short-object-names'
blob
|
diff
|
raw
2016-10-03
Sync with 2.10.1
blob
|
diff
|
raw
2016-10-03
Merge branch 'pb/rev-list-reverse-with-count'
blob
|
diff
|
raw
2016-10-03
Merge branch 'dt/tree-fsck'
blob
|
diff
|
raw
2016-10-03
Merge branch 'kd/mailinfo-quoted-string'
blob
|
diff
|
raw
2016-10-03
Merge branch 'mh/diff-indent-heuristic'
blob
|
diff
|
raw
2016-10-03
Merge branch 'dt/mailinfo'
blob
|
diff
|
raw
2016-10-03
Merge branch 'va/git-gui-i18n'
blob
|
diff
|
raw
2016-10-03
Merge branch 'rs/git-gui-use-modern-git-merge-syntax'
blob
|
diff
|
raw
2016-10-03
Merge branch 'jc/verify-loose-object-header'
blob
|
diff
|
raw
2016-10-03
Merge branch 'nd/init-core-worktree-in-multi-worktree...
blob
|
diff
|
raw
2016-10-03
Merge branch 'ik/gitweb-force-highlight'
blob
|
diff
|
raw
2016-10-03
Merge branch 'rs/copy-array'
blob
|
diff
|
raw
2016-10-03
Merge branch 'jk/ident-ai-canonname-could-be-null'...
blob
|
diff
|
raw
|
diff to current
2016-10-03
Merge branch 'jk/doc-cvs-update' into maint
blob
|
diff
|
raw
|
diff to current
2016-10-03
Merge branch 'jk/pack-tag-of-tag' into maint
blob
|
diff
|
raw
|
diff to current
2016-09-29
Sync with maint
blob
|
diff
|
raw
2016-09-29
Merge branch 'jc/worktree-config'
blob
|
diff
|
raw
2016-09-29
Merge branch 'jk/ident-ai-canonname-could-be-null'
blob
|
diff
|
raw
2016-09-29
Merge branch 'jt/fetch-pack-in-vain-count-with-stateless'
blob
|
diff
|
raw
2016-09-29
Merge branch 'jk/verify-packfile-gently'
blob
|
diff
|
raw
2016-09-29
Merge branch 'jt/mailinfo-fold-in-body-headers'
blob
|
diff
|
raw
2016-09-29
Merge branch 'tg/add-chmod+x-fix' into maint
blob
|
diff
|
raw
|
diff to current
2016-09-29
Merge branch 'et/add-chmod-x' into maint
blob
|
diff
|
raw
|
diff to current
2016-09-29
Merge branch 'ls/travis-homebrew-path-fix' into maint
blob
|
diff
|
raw
|
diff to current
2016-09-29
Merge branch 'js/regexec-buf' into maint
blob
|
diff
|
raw
|
diff to current
2016-09-29
Merge branch 'ep/doc-check-ref-format-example' into...
blob
|
diff
|
raw
|
diff to current
2016-09-29
Merge branch 'mm/config-color-ui-default-to-auto' into...
blob
|
diff
|
raw
|
diff to current
2016-09-29
Merge branch 'jk/reduce-gc-aggressive-depth' into maint
blob
|
diff
|
raw
|
diff to current
2016-09-29
Merge branch 'rs/xdiff-merge-overlapping-hunks-for...
blob
|
diff
|
raw
|
diff to current
2016-09-29
Merge branch 'ew/http-do-not-forget-to-call-curl-multi...
blob
|
diff
|
raw
|
diff to current
2016-09-29
Merge branch 'js/git-gui-commit-gpgsign' into maint
blob
|
diff
|
raw
|
diff to current
2016-09-29
Merge branch 'jk/fix-remote-curl-url-wo-proto' into...
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-29
Merge branch 'rs/strbuf-remove-fix' into maint
blob
|
diff
|
raw
|
diff to current
2016-09-29
Merge branch 'rs/checkout-some-states-are-const' into...
blob
|
diff
|
raw
|
diff to current
2016-09-29
Merge branch 'bw/pathspec-remove-unused-extern-decl...
blob
|
diff
|
raw
|
diff to current
2016-09-26
Merge branch 'jk/clone-recursive-progress'
blob
|
diff
|
raw
2016-09-26
Merge branch 'jk/doc-cvs-update'
blob
|
diff
|
raw
2016-09-26
Merge branch 'rt/rebase-i-broken-insn-advise'
blob
|
diff
|
raw
2016-09-26
Merge branch 'rs/checkout-init-macro'
blob
|
diff
|
raw
2016-09-26
Merge branch 'ls/travis-homebrew-path-fix'
blob
|
diff
|
raw
2016-09-26
Merge branch 'tg/add-chmod+x-fix'
blob
|
diff
|
raw
2016-09-26
Merge branch 'js/regexec-buf'
blob
|
diff
|
raw
2016-09-26
Merge branch 'nd/checkout-disambiguation'
blob
|
diff
|
raw
2016-09-26
Merge branch 'va/i18n-more'
blob
|
diff
|
raw
2016-09-26
Merge branch 'ep/doc-check-ref-format-example'
blob
|
diff
|
raw
|
diff to current
2016-09-26
Merge branch 'mh/diff-indent-heuristic'
blob
|
diff
|
raw
|
diff to current
2016-09-26
Merge branch 'rs/c-auto-resets-attributes'
blob
|
diff
|
raw
|
diff to current
2016-09-26
Merge branch 'mm/config-color-ui-default-to-auto'
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 'jk/reduce-gc-aggressive-depth'
blob
|
diff
|
raw
|
diff to current
2016-09-21
Merge branch 'mr/vcs-svn-printf-ulong'
blob
|
diff
|
raw
|
diff to current
2016-09-21
Merge branch 'rs/xdiff-merge-overlapping-hunks-for...
blob
|
diff
|
raw
|
diff to current
2016-09-21
Merge branch 'rs/strbuf-remove-fix'
blob
|
diff
|
raw
|
diff to current
2016-09-21
Merge branch 'rs/checkout-some-states-are-const'
blob
|
diff
|
raw
|
diff to current
2016-09-21
Merge branch 'jk/setup-sequence-update'
blob
|
diff
|
raw
|
diff to current
2016-09-21
Merge branch 'ew/http-do-not-forget-to-call-curl-multi...
blob
|
diff
|
raw
|
diff to current
next