Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jk/daemon-interpolate'
[gitweb.git]
/
builtin
/
merge.c
2015-03-03
Merge branch 'jk/daemon-interpolate'
blob
|
diff
|
raw
2015-03-03
Merge branch 'rs/daemon-interpolate'
blob
|
diff
|
raw
2015-03-03
Merge branch 'km/send-email-getopt-long-workarounds'
blob
|
diff
|
raw
2015-03-03
Merge branch 'jc/apply-ws-fix-expands-report'
blob
|
diff
|
raw
2015-03-03
Merge branch 'jc/apply-beyond-symlink'
blob
|
diff
|
raw
2015-02-25
Merge branch 'ak/git-pm-typofix'
blob
|
diff
|
raw
2015-02-25
Merge branch 'sb/plug-leak-in-make-cache-entry'
blob
|
diff
|
raw
2015-02-25
Merge branch 'mh/transport-capabilities'
blob
|
diff
|
raw
2015-02-25
Merge branch 'jc/send-email-sensible-encoding'
blob
|
diff
|
raw
2015-02-25
Merge branch 'jk/sanity'
blob
|
diff
|
raw
2015-02-25
Merge branch 'sb/hex-object-name-is-at-most-41-bytes...
blob
|
diff
|
raw
2015-02-25
Merge branch 'jk/fast-import-die-nicely-fix'
blob
|
diff
|
raw
2015-02-25
Merge branch 'dp/remove-duplicated-header-inclusion'
blob
|
diff
|
raw
2015-02-25
Merge branch 'jc/max-io-size-and-ssize-max'
blob
|
diff
|
raw
2015-02-25
Merge branch 'tc/missing-http-proxyauth'
blob
|
diff
|
raw
2015-02-25
Merge branch 'jk/strbuf-doc-to-header'
blob
|
diff
|
raw
2015-02-25
Merge branch 'nd/attr-optim'
blob
|
diff
|
raw
2015-02-25
Merge branch 'jn/doc-api-errors'
blob
|
diff
|
raw
2015-02-25
Sync with 2.3.1
blob
|
diff
|
raw
2015-02-25
Merge branch 'ak/add-i-empty-candidates' into maint
blob
|
diff
|
raw
|
diff to current
2015-02-25
Merge branch 'jc/apply-ws-fix-expands' into maint
blob
|
diff
|
raw
|
diff to current
2015-02-25
Merge branch 'jc/doc-log-rev-list-options' into maint
blob
|
diff
|
raw
|
diff to current
2015-02-25
Merge branch 'mg/commit-author-no-match-malformed-messa...
blob
|
diff
|
raw
|
diff to current
2015-02-25
Merge branch 'jk/dumb-http-idx-fetch-fix' into maint
blob
|
diff
|
raw
|
diff to current
2015-02-25
Merge branch 'jc/diff-format-doc' into maint
blob
|
diff
|
raw
|
diff to current
2015-02-25
Merge branch 'jk/remote-curl-an-array-in-struct-cannot...
blob
|
diff
|
raw
|
diff to current
2015-02-25
Merge branch 'jk/status-read-branch-name-fix' into...
blob
|
diff
|
raw
|
diff to current
2015-02-25
Merge branch 'mg/push-repo-option-doc' into maint
blob
|
diff
|
raw
|
diff to current
2015-02-25
Merge branch 'bc/http-fallback-to-password-after-krb...
blob
|
diff
|
raw
|
diff to current
2015-02-25
Merge branch 'dk/format-patch-ignore-diff-submodule...
blob
|
diff
|
raw
|
diff to current
2015-02-25
Merge branch 'jn/rerere-fail-on-auto-update-failure...
blob
|
diff
|
raw
|
diff to current
2015-02-25
Merge branch 'jk/blame-commit-label' into maint
blob
|
diff
|
raw
|
diff to current
2015-02-22
Merge branch 'jc/conf-var-doc'
blob
|
diff
|
raw
2015-02-22
Merge branch 'es/squelch-openssl-warnings-on-macosx'
blob
|
diff
|
raw
2015-02-22
Merge branch 'tc/curl-vernum-output-broken-in-7.11'
blob
|
diff
|
raw
2015-02-22
Merge branch 'jk/prune-mtime'
blob
|
diff
|
raw
2015-02-22
Merge branch 'jc/diff-files-ita'
blob
|
diff
|
raw
2015-02-22
Merge branch 'ps/submodule-sanitize-path-upon-add'
blob
|
diff
|
raw
2015-02-22
Merge branch 'ab/merge-file-prefix'
blob
|
diff
|
raw
2015-02-22
Merge branch 'es/blame-commit-info-fix'
blob
|
diff
|
raw
2015-02-22
Merge branch 'ss/check-builtins-on-windows'
blob
|
diff
|
raw
2015-02-18
Merge branch 'jc/push-cert'
blob
|
diff
|
raw
2015-02-18
Merge branch 'jk/decimal-width-for-uintmax'
blob
|
diff
|
raw
2015-02-18
Merge branch 'jk/config-no-ungetc-eof'
blob
|
diff
|
raw
2015-02-18
Merge branch 'jk/pack-bitmap'
blob
|
diff
|
raw
2015-02-18
Merge branch 'jc/remote-set-url-doc'
blob
|
diff
|
raw
2015-02-18
Merge branch 'ch/new-gpg-drops-rfc-1991'
blob
|
diff
|
raw
2015-02-18
Merge branch 'ye/http-accept-language'
blob
|
diff
|
raw
2015-02-18
Merge branch 'av/wincred-with-at-in-username-fix'
blob
|
diff
|
raw
2015-02-17
Merge branch 'mg/push-repo-option-doc'
blob
|
diff
|
raw
2015-02-17
Merge branch 'jc/t4122-use-test-write-lines'
blob
|
diff
|
raw
2015-02-17
Merge branch 'jk/status-read-branch-name-fix'
blob
|
diff
|
raw
2015-02-17
Merge branch 'jk/remote-curl-an-array-in-struct-cannot...
blob
|
diff
|
raw
2015-02-17
Merge branch 'jc/diff-format-doc'
blob
|
diff
|
raw
2015-02-17
Merge branch 'jk/dumb-http-idx-fetch-fix'
blob
|
diff
|
raw
2015-02-17
Merge branch 'mg/commit-author-no-match-malformed-message'
blob
|
diff
|
raw
2015-02-17
Merge branch 'jc/doc-log-rev-list-options'
blob
|
diff
|
raw
2015-02-17
Merge branch 'jc/apply-ws-fix-expands'
blob
|
diff
|
raw
2015-02-17
Merge branch 'ak/add-i-empty-candidates'
blob
|
diff
|
raw
2015-02-17
Merge branch 'ks/rebase-i-abbrev'
blob
|
diff
|
raw
2015-02-17
Merge branch 'mh/deref-symref-over-helper-transport'
blob
|
diff
|
raw
2015-02-11
Merge branch 'ah/usage-strings'
blob
|
diff
|
raw
2015-02-11
Merge branch 'jc/pretty-format-doc'
blob
|
diff
|
raw
|
diff to current
2015-02-11
Merge branch 'jc/push-to-checkout'
blob
|
diff
|
raw
|
diff to current
2015-02-11
Merge branch 'sb/atomic-push'
blob
|
diff
|
raw
|
diff to current
2015-02-11
Merge branch 'mh/reflog-expire'
blob
|
diff
|
raw
|
diff to current
2015-02-11
Merge branch 'cj/log-invert-grep'
blob
|
diff
|
raw
|
diff to current
2015-02-11
Merge branch 'km/gettext-n'
blob
|
diff
|
raw
|
diff to current
2015-02-11
Merge branch 'bc/http-fallback-to-password-after-krb...
blob
|
diff
|
raw
|
diff to current
2015-02-11
Merge branch 'dk/format-patch-ignore-diff-submodule'
blob
|
diff
|
raw
|
diff to current
2015-02-11
Merge branch 'jn/rerere-fail-on-auto-update-failure'
blob
|
diff
|
raw
|
diff to current
2015-02-11
Merge branch 'jk/blame-commit-label'
blob
|
diff
|
raw
|
diff to current
2015-02-11
Merge branch 'ld/p4-submit-hint'
blob
|
diff
|
raw
|
diff to current
2015-02-11
Merge branch 'ld/p4-exclude-in-sync'
blob
|
diff
|
raw
|
diff to current
2015-02-11
Merge branch 'jc/coding-guidelines'
blob
|
diff
|
raw
|
diff to current
2015-02-11
Merge branch 'ak/typofixes'
blob
|
diff
|
raw
|
diff to current
2015-01-22
Merge branch 'js/t1050'
blob
|
diff
|
raw
|
diff to current
2015-01-22
Merge branch 'ak/cat-file-clean-up'
blob
|
diff
|
raw
|
diff to current
2015-01-22
Merge branch 'sh/asciidoc-git-version-fix'
blob
|
diff
|
raw
|
diff to current
2015-01-22
Merge branch 'jh/empty-notes'
blob
|
diff
|
raw
|
diff to current
2015-01-21
Merge branch 'jk/http-push-symref-fix'
blob
|
diff
|
raw
|
diff to current
2015-01-21
Merge branch 'ak/show-branch-usage-string'
blob
|
diff
|
raw
|
diff to current
2015-01-20
Merge branch 'jk/colors'
blob
|
diff
|
raw
|
diff to current
2015-01-14
Merge branch 'po/doc-core-ignorestat'
blob
|
diff
|
raw
|
diff to current
2015-01-14
Merge branch 'rc/for-each-ref-tracking'
blob
|
diff
|
raw
|
diff to current
2015-01-14
Merge branch 'rh/autoconf-rhel3'
blob
|
diff
|
raw
|
diff to current
2015-01-14
Merge branch 'ak/fewer-includes'
blob
|
diff
|
raw
|
diff to current
2015-01-14
Merge branch 'ak/doc-add-v-n-options'
blob
|
diff
|
raw
|
diff to current
2015-01-14
Merge branch 'ak/show-branch-usage-string'
blob
|
diff
|
raw
|
diff to current
2015-01-14
Merge branch 'rh/test-color-avoid-terminfo-in-original...
blob
|
diff
|
raw
|
diff to current
2015-01-14
Merge branch 'tf/prompt-preserve-exit-status'
blob
|
diff
|
raw
|
diff to current
2015-01-14
Merge branch 'rh/hide-prompt-in-ignored-directory'
blob
|
diff
|
raw
|
diff to current
2015-01-14
Merge branch 'mm/complete-rebase-autostash'
blob
|
diff
|
raw
|
diff to current
2015-01-14
Merge branch 'aw/doc-smtp-ssl-cert-path'
blob
|
diff
|
raw
|
diff to current
2015-01-14
Merge branch 'sp/subtree-doc'
blob
|
diff
|
raw
|
diff to current
2015-01-14
Merge branch 'km/log-usage-string-i18n'
blob
|
diff
|
raw
|
diff to current
2015-01-14
Merge branch 'km/imap-send-libcurl-options'
blob
|
diff
|
raw
|
diff to current
2015-01-14
Merge branch 'jk/prune-packed-server-info'
blob
|
diff
|
raw
|
diff to current
2015-01-14
Merge branch 'js/remote-add-with-insteadof'
blob
|
diff
|
raw
|
diff to current
2015-01-14
standardize usage info string format
blob
|
diff
|
raw
next