Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jh/empty-notes'
[gitweb.git]
/
builtin
/
merge.c
2015-01-22
Merge branch 'jh/empty-notes'
blob
|
diff
|
raw
2015-01-21
Merge branch 'jk/http-push-symref-fix'
blob
|
diff
|
raw
2015-01-21
Merge branch 'ak/show-branch-usage-string'
blob
|
diff
|
raw
2015-01-20
Merge branch 'jk/colors'
blob
|
diff
|
raw
2015-01-14
Merge branch 'po/doc-core-ignorestat'
blob
|
diff
|
raw
2015-01-14
Merge branch 'rc/for-each-ref-tracking'
blob
|
diff
|
raw
2015-01-14
Merge branch 'rh/autoconf-rhel3'
blob
|
diff
|
raw
2015-01-14
Merge branch 'ak/fewer-includes'
blob
|
diff
|
raw
2015-01-14
Merge branch 'ak/doc-add-v-n-options'
blob
|
diff
|
raw
2015-01-14
Merge branch 'ak/show-branch-usage-string'
blob
|
diff
|
raw
2015-01-14
Merge branch 'rh/test-color-avoid-terminfo-in-original...
blob
|
diff
|
raw
2015-01-14
Merge branch 'tf/prompt-preserve-exit-status'
blob
|
diff
|
raw
2015-01-14
Merge branch 'rh/hide-prompt-in-ignored-directory'
blob
|
diff
|
raw
2015-01-14
Merge branch 'mm/complete-rebase-autostash'
blob
|
diff
|
raw
2015-01-14
Merge branch 'aw/doc-smtp-ssl-cert-path'
blob
|
diff
|
raw
2015-01-14
Merge branch 'sp/subtree-doc'
blob
|
diff
|
raw
2015-01-14
Merge branch 'km/log-usage-string-i18n'
blob
|
diff
|
raw
2015-01-14
Merge branch 'km/imap-send-libcurl-options'
blob
|
diff
|
raw
2015-01-14
Merge branch 'jk/prune-packed-server-info'
blob
|
diff
|
raw
2015-01-14
Merge branch 'js/remote-add-with-insteadof'
blob
|
diff
|
raw
2015-01-12
Sync with 2.2.2
blob
|
diff
|
raw
2015-01-12
Merge branch 'jk/read-packed-refs-without-path-max...
blob
|
diff
|
raw
|
diff to current
2015-01-12
Merge branch 'mh/find-uniq-abbrev' into maint
blob
|
diff
|
raw
|
diff to current
2015-01-12
Merge branch 'jk/approxidate-avoid-y-d-m-over-future...
blob
|
diff
|
raw
|
diff to current
2015-01-12
Merge branch 'rw/apply-does-not-take-ignore-date' into...
blob
|
diff
|
raw
|
diff to current
2015-01-12
Merge branch 'jk/for-each-reflog-ent-reverse' into...
blob
|
diff
|
raw
|
diff to current
2015-01-12
Merge branch 'bc/fetch-thin-less-aggressive-in-normal...
blob
|
diff
|
raw
2015-01-12
Merge branch 'sb/doc-submitting-patches-keep-notes'
blob
|
diff
|
raw
2015-01-12
Merge branch 'rs/simplify-transport-get'
blob
|
diff
|
raw
2015-01-12
Merge branch 'rs/simplify-parsing-commit-tree-S'
blob
|
diff
|
raw
2015-01-12
Merge branch 'rs/plug-strbuf-leak-in-merge'
blob
|
diff
|
raw
2015-01-12
Merge branch 'rs/plug-strbuf-leak-in-lock-ref'
blob
|
diff
|
raw
|
diff to current
2015-01-12
Merge branch 'es/checkout-index-temp'
blob
|
diff
|
raw
|
diff to current
2015-01-12
Merge branch 'cc/bisect-rev-parsing'
blob
|
diff
|
raw
|
diff to current
2015-01-07
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2015-01-07
Merge branch 'maint-2.1' into maint
blob
|
diff
|
raw
|
diff to current
2015-01-07
Merge branch 'maint-2.0' into maint-2.1
blob
|
diff
|
raw
|
diff to current
2015-01-07
Merge branch 'maint-1.9' into maint-2.0
blob
|
diff
|
raw
|
diff to current
2015-01-07
Merge branch 'maint-1.8.5' into maint-1.9
blob
|
diff
|
raw
|
diff to current
2015-01-07
Merge branch 'bw/maint-0090-awk-tweak'
blob
|
diff
|
raw
|
diff to current
2015-01-07
Merge branch 'jh/pre-push-sample-no-custom-ifs'
blob
|
diff
|
raw
|
diff to current
2015-01-07
Merge branch 'tf/prompt-preserve-exit-status'
blob
|
diff
|
raw
|
diff to current
2015-01-07
Merge branch 'sb/dco-indentation-fix'
blob
|
diff
|
raw
|
diff to current
2015-01-07
Merge branch 'bb/update-unicode-table'
blob
|
diff
|
raw
|
diff to current
2015-01-07
Merge branch 'es/squelch-openssl-warnings-on-macosx'
blob
|
diff
|
raw
|
diff to current
2015-01-07
Merge branch 'sb/t5400-remove-unused'
blob
|
diff
|
raw
|
diff to current
2015-01-07
Merge branch 'lh/send-email-hide-x-mailer'
blob
|
diff
|
raw
|
diff to current
2015-01-07
Merge branch 'rd/send-email-2047-fix'
blob
|
diff
|
raw
|
diff to current
2015-01-07
Merge branch 'pd/completion-filenames-fix'
blob
|
diff
|
raw
|
diff to current
2015-01-07
Merge branch 'jk/add-i-read-error'
blob
|
diff
|
raw
|
diff to current
2015-01-07
Merge branch 'jk/approxidate-avoid-y-d-m-over-future...
blob
|
diff
|
raw
|
diff to current
2015-01-07
Merge branch 'br/imap-send-via-libcurl'
blob
|
diff
|
raw
|
diff to current
2015-01-07
Merge branch 'br/imap-send-verbosity'
blob
|
diff
|
raw
|
diff to current
2015-01-07
Merge branch 'nd/lockfile-absolute'
blob
|
diff
|
raw
|
diff to current
2015-01-07
Merge branch 'jc/merge-bases'
blob
|
diff
|
raw
|
diff to current
2015-01-07
Merge branch 'jc/strbuf-add-lines-avoid-sp-ht-sequence'
blob
|
diff
|
raw
|
diff to current
2015-01-07
Merge branch 'jc/diff-b-m'
blob
|
diff
|
raw
|
diff to current
2015-01-07
Merge branch 'jc/clone-borrow'
blob
|
diff
|
raw
|
diff to current
2015-01-07
Merge branch 'jc/checkout-local-track-report'
blob
|
diff
|
raw
|
diff to current
2014-12-29
Merge branch 'for-junio' of git://bogomips.org/git-svn
blob
|
diff
|
raw
|
diff to current
2014-12-29
merge: release strbuf after use in suggest_conflicts()
blob
|
diff
|
raw
|
diff to current
2014-12-29
Merge branch 'jc/t9001-modernise'
blob
|
diff
|
raw
|
diff to current
2014-12-29
Merge branch 'mh/update-ref-verify'
blob
|
diff
|
raw
|
diff to current
2014-12-22
Sync with maint
blob
|
diff
|
raw
|
diff to current
2014-12-22
Merge branch 'rs/use-strbuf-complete-line'
blob
|
diff
|
raw
|
diff to current
2014-12-22
Merge branch 'jg/prompt-localize-temporary'
blob
|
diff
|
raw
|
diff to current
2014-12-22
Merge branch 'ch/new-gpg-drops-rfc-1991'
blob
|
diff
|
raw
|
diff to current
2014-12-22
Merge branch 'jk/commit-date-approxidate'
blob
|
diff
|
raw
|
diff to current
2014-12-22
Merge branch 'nd/split-index'
blob
|
diff
|
raw
|
diff to current
2014-12-22
Merge branch 'jk/test-asan'
blob
|
diff
|
raw
|
diff to current
2014-12-22
Merge branch 'ok/rebase-i-count-todo'
blob
|
diff
|
raw
|
diff to current
2014-12-22
Merge branch 'jk/read-packed-refs-without-path-max'
blob
|
diff
|
raw
|
diff to current
2014-12-22
Merge branch 'jk/always-allow-large-packets'
blob
|
diff
|
raw
|
diff to current
2014-12-22
Merge branch 'jk/colors'
blob
|
diff
|
raw
|
diff to current
2014-12-22
Merge branch 'rw/apply-does-not-take-ignore-date'
blob
|
diff
|
raw
|
diff to current
2014-12-22
Merge branch 'js/test-hashmap-squelch-gcc'
blob
|
diff
|
raw
|
diff to current
2014-12-22
Merge branch 'js/fsck-tag-validation'
blob
|
diff
|
raw
|
diff to current
2014-12-22
Merge branch 'po/doc-assume-unchanged'
blob
|
diff
|
raw
|
diff to current
2014-12-22
Merge branch 'mg/branch-d-m-f'
blob
|
diff
|
raw
|
diff to current
2014-12-22
Merge branch 'tb/t0027-eol-conversion'
blob
|
diff
|
raw
|
diff to current
2014-12-22
Merge branch 'jk/for-each-reflog-ent-reverse'
blob
|
diff
|
raw
|
diff to current
2014-12-22
Merge branch 'sb/string-list'
blob
|
diff
|
raw
|
diff to current
2014-12-22
Merge branch 'sv/doc-stripspace'
blob
|
diff
|
raw
|
diff to current
2014-12-22
Merge branch 'rt/completion-tag'
blob
|
diff
|
raw
|
diff to current
2014-12-22
Merge branch 'mg/doc-check-ignore-tracked-are-not-ignored'
blob
|
diff
|
raw
|
diff to current
2014-12-22
Merge branch 'jk/credential-quit'
blob
|
diff
|
raw
|
diff to current
2014-12-22
Merge branch 'dm/compat-s-ifmt-for-zos'
blob
|
diff
|
raw
|
diff to current
2014-12-22
Merge branch 'ps/new-workdir-into-empty-directory'
blob
|
diff
|
raw
|
diff to current
2014-12-22
Merge branch 'nd/ls-tree-pathspec'
blob
|
diff
|
raw
|
diff to current
2014-12-22
Merge branch 'jc/hook-cleanup'
blob
|
diff
|
raw
|
diff to current
2014-12-22
Merge branch 'rt/for-each-ref-spell-tcl-as-Tcl'
blob
|
diff
|
raw
|
diff to current
2014-12-22
Merge branch 'rj/t0050-passes'
blob
|
diff
|
raw
|
diff to current
2014-12-22
Merge branch 'js/push-to-deploy'
blob
|
diff
|
raw
|
diff to current
2014-12-22
Merge branch 'jc/exec-cmd-system-path-leak-fix'
blob
|
diff
|
raw
|
diff to current
2014-12-22
Merge branch 'mh/find-uniq-abbrev'
blob
|
diff
|
raw
|
diff to current
2014-12-22
Merge branch 'pb/send-email-te'
blob
|
diff
|
raw
|
diff to current
2014-12-22
Merge branch 'pb/am-message-id-footer'
blob
|
diff
|
raw
|
diff to current
2014-12-22
Merge branch 'mh/simplify-repack-without-refs'
blob
|
diff
|
raw
|
diff to current
2014-12-22
Merge branch 'dw/shell-basename-dashdash-before-strippi...
blob
|
diff
|
raw
|
diff to current
2014-12-22
Merge branch 'rj/no-xopen-source-for-cygwin'
blob
|
diff
|
raw
|
diff to current
next