Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
t3404: todo list with commented-out commands only aborts
[gitweb.git]
/
ll-merge.c
2018-06-28
Merge branch 'jk/fetch-all-peeled-fix'
blob
|
diff
|
raw
2018-06-18
Merge branch 'ks/branch-set-upstream'
blob
|
diff
|
raw
2018-06-18
Merge branch 'mw/doc-merge-enumfix'
blob
|
diff
|
raw
2018-05-30
Merge branch 'rs/no-null-ptr-arith-in-fast-export'
blob
|
diff
|
raw
2018-05-22
Sync with Git 2.13.7
blob
|
diff
|
raw
2018-05-22
Merge branch 'jk/submodule-name-verify-fix' into jk...
blob
|
diff
|
raw
2018-05-08
Merge branch 'nd/submodule-status-fix'
blob
|
diff
|
raw
2018-05-08
Merge branch 'ab/git-svn-get-record-typofix'
blob
|
diff
|
raw
2018-04-25
Merge branch 'bp/fsmonitor-bufsize-fix'
blob
|
diff
|
raw
2018-04-25
Merge branch 'es/fread-reads-dir-autoconf-fix'
blob
|
diff
|
raw
2018-04-25
Merge branch 'js/t5404-path-fix'
blob
|
diff
|
raw
2018-04-25
Merge branch 'mn/send-email-credential-doc'
blob
|
diff
|
raw
2018-04-25
Merge branch 'ak/bisect-doc-typofix'
blob
|
diff
|
raw
2018-04-10
Merge branch 'ys/bisect-object-id-missing-conversion...
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 'bp/fsmonitor' 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 'rb/hashmap-h-compilation-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-03-21
Merge branch 'dp/merge-strategy-doc-fix'
blob
|
diff
|
raw
2018-03-21
Merge branch 'ks/t3200-typofix'
blob
|
diff
|
raw
2018-03-08
Merge branch 'mk/doc-pretty-fill'
blob
|
diff
|
raw
2018-03-08
Merge branch 'ds/mark-parents-uninteresting-optim'
blob
|
diff
|
raw
2018-03-08
Merge branch 'ds/find-unique-abbrev-optim'
blob
|
diff
|
raw
2018-03-08
Merge branch 'sg/travis-build-during-script-phase'
blob
|
diff
|
raw
2018-03-06
Merge branch 'xz/send-email-batch-size'
blob
|
diff
|
raw
2018-03-06
Merge branch 'cb/ttk-style' of git-gui into cb/git...
blob
|
diff
|
raw
2018-03-02
Merge branch 'bb/ssh-key-files' of git-gui into bb...
blob
|
diff
|
raw
2018-03-02
Merge branch 'bp/bind-kp-enter' of git-gui into bp...
blob
|
diff
|
raw
2018-02-28
Merge branch 'tz/do-not-clean-spec-file'
blob
|
diff
|
raw
2018-02-28
Merge branch 'gs/test-unset-xdg-cache-home'
blob
|
diff
|
raw
2018-02-28
Merge branch 'sb/status-doc-fix'
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-27
Merge branch 'bp/fsmonitor'
blob
|
diff
|
raw
2018-02-27
Merge branch 'bc/doc-interpret-trailers-grammofix'
blob
|
diff
|
raw
2018-02-27
Merge branch 'bp/name-hash-dirname-fix'
blob
|
diff
|
raw
2018-02-15
Merge branch 'as/read-tree-prefix-doc-fix' into maint
blob
|
diff
|
raw
2018-02-15
Merge branch 'jc/merge-symlink-ours-theirs' into maint
blob
|
diff
|
raw
2018-02-15
Merge branch 'jm/svn-pushmergeinfo-fix' into maint
blob
|
diff
|
raw
2018-02-15
Merge branch 'tg/reset-hard-show-head-with-pretty'
blob
|
diff
|
raw
2018-02-15
Merge branch 'sb/pull-rebase-submodule'
blob
|
diff
|
raw
2018-02-15
Merge branch 'jt/fsck-code-cleanup'
blob
|
diff
|
raw
2018-02-13
Merge branch 'jc/mailinfo-cleanup-fix'
blob
|
diff
|
raw
2018-02-13
Merge branch 'rb/hashmap-h-compilation-fix'
blob
|
diff
|
raw
2018-02-13
Merge branch 'nd/diff-flush-before-warning'
blob
|
diff
|
raw
2018-02-13
Merge branch 'cl/t9001-cleanup'
blob
|
diff
|
raw
2018-01-23
Merge branch 'as/read-tree-prefix-doc-fix'
blob
|
diff
|
raw
2018-01-23
Merge branch 'ys/bisect-object-id-missing-conversion...
blob
|
diff
|
raw
2018-01-23
Merge branch 'cc/codespeed'
blob
|
diff
|
raw
2018-01-23
Merge branch 'jc/merge-symlink-ours-theirs'
blob
|
diff
|
raw
2018-01-23
Merge branch 'jm/svn-pushmergeinfo-fix'
blob
|
diff
|
raw
2018-01-23
Merge branch 'nd/ita-wt-renames-in-status'
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-28
Merge branch 'bp/fsmonitor'
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 'jk/no-optional-locks'
blob
|
diff
|
raw
2017-12-13
Merge branch 'ks/doc-checkout-previous'
blob
|
diff
|
raw
2017-12-13
Merge branch 'pc/submodule-helper'
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 'cc/perf-run-config'
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-06
Merge branch 'mh/avoid-rewriting-packed-refs' into...
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
next