Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first
⋅
prev
⋅
next
commit
grep
author
committer
pickaxe
?
re
ls-remote: create '--sort' option
[gitweb.git]
/
builtin
/
merge.c
2018-02-27
Merge branch 'ys/bisect-object-id-missing-conversion...
blob
|
diff
|
raw
2018-02-27
Merge branch 'ab/commit-m-with-fixup' into maint
blob
|
diff
|
raw
2018-02-27
Merge branch 'nd/ita-wt-renames-in-status' into maint
blob
|
diff
|
raw
2018-02-27
Merge branch 'jt/binsearch-with-fanout'
blob
|
diff
|
raw
|
diff to current
2018-02-27
Merge branch 'rd/typofix'
blob
|
diff
|
raw
|
diff to current
2018-02-27
Merge branch 'jk/test-hashmap-updates'
blob
|
diff
|
raw
|
diff to current
2018-02-27
Merge branch 'jk/sq-dequote-on-bogus-input'
blob
|
diff
|
raw
|
diff to current
2018-02-27
Merge branch 'bp/fsmonitor'
blob
|
diff
|
raw
|
diff to current
2018-02-27
Merge branch 'bc/doc-interpret-trailers-grammofix'
blob
|
diff
|
raw
|
diff to current
2018-02-27
Merge branch 'as/ll-i18n'
blob
|
diff
|
raw
|
diff to current
2018-02-27
Merge branch 'sg/doc-test-must-fail-args'
blob
|
diff
|
raw
|
diff to current
2018-02-27
Merge branch 'sb/describe-blob'
blob
|
diff
|
raw
|
diff to current
2018-02-27
Merge branch 'rs/check-ignore-multi'
blob
|
diff
|
raw
|
diff to current
2018-02-27
Merge branch 'rj/sparse-updates'
blob
|
diff
|
raw
|
diff to current
2018-02-27
Merge branch 'jk/t0002-simplify'
blob
|
diff
|
raw
|
diff to current
2018-02-27
Merge branch 'js/packet-read-line-check-null'
blob
|
diff
|
raw
|
diff to current
2018-02-27
Merge branch 'js/fix-merge-arg-quoting-in-rebase-p'
blob
|
diff
|
raw
|
diff to current
2018-02-27
Merge branch 'jk/gettext-poison'
blob
|
diff
|
raw
|
diff to current
2018-02-27
Merge branch 'jk/doc-do-not-write-extern'
blob
|
diff
|
raw
|
diff to current
2018-02-27
Merge branch 'bp/name-hash-dirname-fix'
blob
|
diff
|
raw
|
diff to current
2018-02-27
Merge branch 'jc/blame-missing-path'
blob
|
diff
|
raw
|
diff to current
2018-02-27
Merge branch 'ab/untracked-cache-invalidation-docs'
blob
|
diff
|
raw
|
diff to current
2018-02-27
Merge branch 'nd/fix-untracked-cache-invalidation'
blob
|
diff
|
raw
|
diff to current
2018-02-21
Merge branch 'sg/test-i18ngrep'
blob
|
diff
|
raw
|
diff to current
2018-02-21
Merge branch 'gs/rebase-allow-empty-message'
blob
|
diff
|
raw
|
diff to current
2018-02-21
Merge branch 'lw/daemon-log-destination'
blob
|
diff
|
raw
|
diff to current
2018-02-21
Merge branch 'nd/format-patch-stat-width'
blob
|
diff
|
raw
|
diff to current
2018-02-16
merge: allow fast-forward when merging a tracked tag
blob
|
diff
|
raw
|
diff to current
2018-02-15
Sync with 2.16.2
blob
|
diff
|
raw
|
diff to current
2018-02-15
Merge branch 'ab/doc-cat-file-e-still-shows-errors...
blob
|
diff
|
raw
2018-02-15
Merge branch 'as/read-tree-prefix-doc-fix' into maint
blob
|
diff
|
raw
2018-02-15
Merge branch 'tg/stash-with-pathspec-fix' into maint
blob
|
diff
|
raw
2018-02-15
Merge branch 'jk/abort-clone-with-existing-dest' into...
blob
|
diff
|
raw
2018-02-15
Merge branch 'jc/merge-symlink-ours-theirs' into maint
blob
|
diff
|
raw
2018-02-15
Merge branch 'rs/lose-leak-pending' into maint
blob
|
diff
|
raw
2018-02-15
Merge branch 'jm/svn-pushmergeinfo-fix' into maint
blob
|
diff
|
raw
2018-02-15
Merge branch 'dk/describe-all-output-fix' into maint
blob
|
diff
|
raw
2018-02-15
Merge branch 'bc/hash-algo'
blob
|
diff
|
raw
|
diff to current
2018-02-15
Merge branch 'nd/ignore-glob-doc-update'
blob
|
diff
|
raw
|
diff to current
2018-02-15
Merge branch 'tg/reset-hard-show-head-with-pretty'
blob
|
diff
|
raw
|
diff to current
2018-02-15
Merge branch 'rs/cocci-strbuf-addf-to-addstr'
blob
|
diff
|
raw
|
diff to current
2018-02-15
Merge branch 'nd/trace-index-ops'
blob
|
diff
|
raw
|
diff to current
2018-02-15
Merge branch 'cc/perf-aggregate'
blob
|
diff
|
raw
|
diff to current
2018-02-15
Merge branch 'ab/wildmatch-tests'
blob
|
diff
|
raw
|
diff to current
2018-02-15
Merge branch 'po/object-id'
blob
|
diff
|
raw
|
diff to current
2018-02-15
Merge branch 'sb/pull-rebase-submodule'
blob
|
diff
|
raw
2018-02-15
Merge branch 'kg/packed-ref-cache-fix'
blob
|
diff
|
raw
2018-02-15
Merge branch 'jt/fsck-code-cleanup'
blob
|
diff
|
raw
2018-02-15
Merge branch 'jc/worktree-add-short-help'
blob
|
diff
|
raw
2018-02-15
Merge branch 'ab/sha1dc-build'
blob
|
diff
|
raw
2018-02-14
object: rename function 'typename' to 'type_name'
blob
|
diff
|
raw
|
diff to current
2018-02-13
Merge branch 'tz/doc-show-defaults-to-head'
blob
|
diff
|
raw
2018-02-13
Merge branch 'pw/sequencer-in-process-commit'
blob
|
diff
|
raw
2018-02-13
Merge branch 'jc/mailinfo-cleanup-fix'
blob
|
diff
|
raw
2018-02-13
Merge branch 'tg/split-index-fixes'
blob
|
diff
|
raw
2018-02-13
Merge branch 'rs/strbuf-cocci-workaround'
blob
|
diff
|
raw
2018-02-13
Merge branch 'mr/packed-ref-store-fix'
blob
|
diff
|
raw
2018-02-13
Merge branch 'cc/sha1-file-name'
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-02-13
Merge branch 'gs/retire-mru'
blob
|
diff
|
raw
2018-02-13
Merge branch 'ot/mru-on-list'
blob
|
diff
|
raw
2018-02-13
Merge branch 'jh/partial-clone'
blob
|
diff
|
raw
2018-02-13
Merge branch 'jh/fsck-promisors'
blob
|
diff
|
raw
2018-02-13
Merge branch 'ab/simplify-perl-makefile'
blob
|
diff
|
raw
2018-01-30
commit: convert commit_tree* to object_id
blob
|
diff
|
raw
|
diff to current
2018-01-23
Merge branch 'ab/doc-cat-file-e-still-shows-errors'
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 'tg/stash-with-pathspec-fix'
blob
|
diff
|
raw
2018-01-23
Merge branch 'bw/oidmap-autoinit'
blob
|
diff
|
raw
2018-01-23
Merge branch 'ab/commit-m-with-fixup'
blob
|
diff
|
raw
2018-01-23
Merge branch 'cc/codespeed'
blob
|
diff
|
raw
2018-01-23
Merge branch 'sb/diff-blobfind-pickaxe'
blob
|
diff
|
raw
2018-01-23
Merge branch 'jk/abort-clone-with-existing-dest'
blob
|
diff
|
raw
2018-01-23
Merge branch 'jc/merge-symlink-ours-theirs'
blob
|
diff
|
raw
2018-01-23
Merge branch 'rs/lose-leak-pending'
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-23
Merge branch 'dk/describe-all-output-fix'
blob
|
diff
|
raw
2018-01-22
Merge branch 'bc/hash-algo' into maint
blob
|
diff
|
raw
2018-01-11
Merge branch 'jh/object-filtering'
blob
|
diff
|
raw
2018-01-11
Merge branch 'tg/worktree-create-tracking'
blob
|
diff
|
raw
2018-01-11
Merge branch 'js/test-with-ws-in-path'
blob
|
diff
|
raw
2018-01-10
Merge branch 'ew/empty-merge-with-dirty-index'
blob
|
diff
|
raw
2018-01-10
Merge branch 'ma/bisect-leakfix'
blob
|
diff
|
raw
2018-01-10
Merge branch 'js/fix-merge-arg-quoting-in-rebase-p'
blob
|
diff
|
raw
2018-01-09
Merge branch 'jk/doc-diff-options'
blob
|
diff
|
raw
2018-01-09
Merge branch 'bw/protocol-v1'
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 'bc/submitting-patches-in-asciidoc'
blob
|
diff
|
raw
2018-01-09
Merge branch 'sg/travis-skip-identical-test'
blob
|
diff
|
raw
2018-01-09
Merge branch 'ab/dc-sha1-loose-ends'
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-09
Merge branch 'ew/empty-merge-with-dirty-index-maint...
blob
|
diff
|
raw
|
diff to current
2018-01-05
Merge branch 'js/sequencer-cleanups'
blob
|
diff
|
raw
2018-01-05
Merge branch 'jh/memihash-opt'
blob
|
diff
|
raw
next