Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
Merge branch 'ls/travis-scriptify' into maint
[gitweb.git]
/
builtin
/
merge.c
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-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
2017-10-18
Merge branch 'jk/doc-read-tree-table-asciidoctor-fix...
blob
|
diff
|
raw
2017-10-18
Merge branch 'kd/doc-for-each-ref' into maint
blob
|
diff
|
raw
2017-10-18
Merge branch 'cc/subprocess-handshake-missing-capabilit...
blob
|
diff
|
raw
2017-10-18
Merge branch 'jk/system-path-cleanup' into maint
blob
|
diff
|
raw
2017-10-18
Merge branch 'bb/doc-eol-dirty' into maint
blob
|
diff
|
raw
2017-10-18
Merge branch 'mg/timestamp-t-fix' into maint
blob
|
diff
|
raw
2017-10-18
Merge branch 'ma/pkt-line-leakfix' into maint
blob
|
diff
|
raw
2017-10-18
Merge branch 'jk/config-lockfile-leak-fix' into maint
blob
|
diff
|
raw
2017-10-18
Merge branch 'dw/diff-highlight-makefile-fix' into...
blob
|
diff
|
raw
2017-10-18
Merge branch 'jk/drop-sha1-entry-pos' into maint
blob
|
diff
|
raw
2017-10-18
Merge branch 'rb/compat-poll-fix' into maint
blob
|
diff
|
raw
2017-10-18
Merge branch 'ar/request-pull-phrasofix' into maint
blob
|
diff
|
raw
2017-10-18
Merge branch 'jc/merge-x-theirs-docfix' into maint
blob
|
diff
|
raw
2017-10-18
Merge branch 'rs/mailinfo-qp-decode-fix' into maint
blob
|
diff
|
raw
2017-10-18
Merge branch 'ik/userdiff-html-h-element-fix' into...
blob
|
diff
|
raw
2017-10-18
Merge branch 'jk/diff-blob' into maint
blob
|
diff
|
raw
2017-10-18
Merge branch 'jk/describe-omit-some-refs' into maint
blob
|
diff
|
raw
2017-10-18
Merge branch 'aw/gc-lockfile-fscanf-fix' into maint
blob
|
diff
|
raw
2017-10-18
Merge branch 'rs/archive-excluded-directory' into maint
blob
|
diff
|
raw
2017-10-18
Merge branch 'rk/commit-tree-make-F-verbatim' into...
blob
|
diff
|
raw
2017-10-18
Merge branch 'mh/packed-ref-store-prep' into maint
blob
|
diff
|
raw
2017-10-18
Merge branch 'mm/send-email-cc-cruft' into maint
blob
|
diff
|
raw
2017-10-18
Merge branch 'rs/strbuf-getwholeline-fix' into maint
blob
|
diff
|
raw
2017-10-17
Merge branch 'jk/ui-color-always-to-auto-maint' (early...
blob
|
diff
|
raw
2017-09-22
Sync with 2.13.6
blob
|
diff
|
raw
2017-09-22
Sync with 2.12.5
blob
|
diff
|
raw
|
diff to current
2017-09-22
Sync with 2.11.4
blob
|
diff
|
raw
|
diff to current
2017-09-22
Sync with 2.10.5
blob
|
diff
|
raw
|
diff to current
2017-09-22
Merge branch 'jk/safe-pipe-capture' into maint-2.10
blob
|
diff
|
raw
|
diff to current
2017-09-22
Merge branch 'jk/cvsimport-quoting' into maint-2.10
blob
|
diff
|
raw
|
diff to current
2017-09-22
Merge branch 'jc/cvsserver' into maint-2.10
blob
|
diff
|
raw
|
diff to current
2017-09-22
Merge branch 'jk/git-shell-drop-cvsserver' into maint...
blob
|
diff
|
raw
|
diff to current
2017-09-10
Merge branch 'jt/doc-pack-objects-fix' into maint
blob
|
diff
|
raw
2017-09-10
Merge branch 'jn/vcs-svn-cleanup' into maint
blob
|
diff
|
raw
2017-09-10
Merge branch 'bc/vcs-svn-cleanup' into maint
blob
|
diff
|
raw
2017-09-10
Merge branch 'jk/doc-the-this' into maint
blob
|
diff
|
raw
2017-09-10
Merge branch 'rs/commit-h-single-parent-cleanup' into...
blob
|
diff
|
raw
2017-09-10
Merge branch 'mg/format-ref-doc-fix' into maint
blob
|
diff
|
raw
2017-09-10
Merge branch 'sb/submodule-parallel-update' into maint
blob
|
diff
|
raw
2017-09-10
Merge branch 'hv/t5526-andand-chain-fix' into maint
blob
|
diff
|
raw
2017-09-10
Merge branch 'sb/sha1-file-cleanup' into maint
blob
|
diff
|
raw
2017-09-10
Merge branch 'rs/t1002-do-not-use-sum' into maint
blob
|
diff
|
raw
2017-09-10
Merge branch 'ah/doc-empty-string-is-false' into maint
blob
|
diff
|
raw
2017-09-10
Merge branch 'rs/merge-microcleanup' into maint
blob
|
diff
|
raw
2017-09-10
Merge branch 'rs/find-pack-entry-bisection' into maint
blob
|
diff
|
raw
|
diff to current
2017-09-10
Merge branch 'rs/apply-lose-prefix-length' 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 'jk/hashcmp-memcmp' 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 'mf/no-dashed-subcommands' into maint
blob
|
diff
|
raw
|
diff to current
2017-09-10
Merge branch 'ab/ref-filter-no-contains' into maint
blob
|
diff
|
raw
|
diff to current
2017-09-10
Merge branch 'rs/archive-excluded-directory' into maint
blob
|
diff
|
raw
|
diff to current
2017-09-10
Merge branch 'mg/killed-merge' into maint
blob
|
diff
|
raw
|
diff to current
2017-09-10
Merge branch 'tb/apply-with-crlf' into maint
blob
|
diff
|
raw
|
diff to current
2017-09-10
Merge branch 'cc/subprocess-handshake-missing-capabilit...
blob
|
diff
|
raw
|
diff to current
2017-09-10
Merge branch 'as/grep-quiet-no-match-exit-code-fix...
blob
|
diff
|
raw
|
diff to current
2017-09-10
Merge branch 'kd/stash-with-bash-4.4' into maint
blob
|
diff
|
raw
|
diff to current
2017-09-10
Merge branch 'rs/win32-syslog-leakfix' into maint
blob
|
diff
|
raw
|
diff to current
2017-09-10
Merge branch 'rs/unpack-entry-leakfix' into maint
blob
|
diff
|
raw
|
diff to current
2017-09-10
Merge branch 'rs/fsck-obj-leakfix' into maint
blob
|
diff
|
raw
|
diff to current
2017-09-10
Merge branch 'ur/svn-local-zone' into maint
blob
|
diff
|
raw
|
diff to current
2017-09-10
Merge branch 'pw/am-signoff' into maint
blob
|
diff
|
raw
|
diff to current
2017-09-10
Merge branch 'rs/in-obsd-basename-dirname-take-const...
blob
|
diff
|
raw
|
diff to current
2017-09-10
Merge branch 'rs/t4062-obsd' into maint
blob
|
diff
|
raw
|
diff to current
2017-09-10
Merge branch 'rs/obsd-getcwd-workaround' into maint
blob
|
diff
|
raw
|
diff to current
2017-09-10
Merge branch 'bw/clone-recursive-quiet' into maint
blob
|
diff
|
raw
|
diff to current
2017-09-10
Merge branch 'pw/sequence-rerere-autoupdate' into maint
blob
|
diff
|
raw
|
diff to current
2017-09-10
Merge branch 'bw/push-options-recursively-to-submodules...
blob
|
diff
|
raw
|
diff to current
2017-09-10
Merge branch 'ma/pager-per-subcommand-action' into...
blob
|
diff
|
raw
|
diff to current
2017-09-10
Merge branch 'jk/rev-list-empty-input' into maint
blob
|
diff
|
raw
|
diff to current
2017-09-10
Merge branch 'st/lib-gpg-kill-stray-agent' into maint
blob
|
diff
|
raw
|
diff to current
2017-08-23
Merge branch 'jt/t1450-fsck-corrupt-packfile' into...
blob
|
diff
|
raw
|
diff to current
2017-08-23
Merge branch 'jb/t8008-cleanup' into maint
blob
|
diff
|
raw
|
diff to current
2017-08-23
Merge branch 'jt/subprocess-handshake' into maint
blob
|
diff
|
raw
|
diff to current
2017-08-23
Merge branch 'dc/fmt-merge-msg-microcleanup' into maint
blob
|
diff
|
raw
|
diff to current
2017-08-23
Merge branch 'ah/doc-wserrorhighlight' into maint
blob
|
diff
|
raw
|
diff to current
2017-08-23
Merge branch 'cc/ref-is-hidden-microcleanup' into maint
blob
|
diff
|
raw
|
diff to current
2017-08-23
Merge branch 'js/run-process-parallel-api-fix' into...
blob
|
diff
|
raw
|
diff to current
2017-08-23
Merge branch 'rs/pack-objects-pbase-cleanup' into maint
blob
|
diff
|
raw
|
diff to current
2017-08-23
Merge branch 'jt/fsck-code-cleanup' into maint
blob
|
diff
|
raw
|
diff to current
2017-08-23
Merge branch 'rs/stat-data-unaligned-reads-fix' into...
blob
|
diff
|
raw
|
diff to current
2017-08-23
Merge branch 'rs/move-array' into maint
blob
|
diff
|
raw
|
diff to current
2017-08-23
Merge branch 'rs/bswap-ubsan-fix' into maint
blob
|
diff
|
raw
|
diff to current
2017-08-23
Merge branch 'dl/credential-cache-socket-in-xdg-cache...
blob
|
diff
|
raw
|
diff to current
2017-08-23
Merge branch 'hb/gitweb-project-list' into maint
blob
|
diff
|
raw
|
diff to current
2017-08-23
Merge branch 'ks/commit-abort-on-empty-message-fix...
blob
|
diff
|
raw
|
diff to current
2017-08-23
Merge branch 'jc/http-sslkey-and-ssl-cert-are-paths...
blob
|
diff
|
raw
|
diff to current
2017-08-23
merge: save merge state earlier
blob
|
diff
|
raw
|
diff to current
2017-08-23
merge: split write_merge_state in two
blob
|
diff
|
raw
|
diff to current
2017-08-23
merge: clarify call chain
blob
|
diff
|
raw
|
diff to current
2017-08-10
merge: use skip_prefix()
blob
|
diff
|
raw
|
diff to current
2017-08-04
Merge tag 'v2.13.5' into maint
blob
|
diff
|
raw
|
diff to current
2017-08-04
Merge branch 'ah/patch-id-doc'
blob
|
diff
|
raw
|
diff to current
2017-08-04
Merge branch 'as/diff-options-grammofix'
blob
|
diff
|
raw
|
diff to current
next