Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jn/perl-lib-extra'
[gitweb.git]
/
Documentation
/
git-merge.txt
2013-12-05
Merge branch 'jn/mediawiki-makefile-updates'
blob
|
diff
|
raw
2013-12-05
Merge branch 'jk/two-way-merge-corner-case-fix'
blob
|
diff
|
raw
2013-12-05
Merge branch 'jc/ref-excludes'
blob
|
diff
|
raw
2013-12-05
Merge branch 'bc/http-100-continue'
blob
|
diff
|
raw
2013-12-05
Merge branch 'jc/merge-base-reflog'
blob
|
diff
|
raw
2013-12-05
Merge branch 'jk/replace-perl-in-built-scripts'
blob
|
diff
|
raw
2013-12-05
Merge branch 'jk/robustify-parse-commit'
blob
|
diff
|
raw
2013-12-05
Merge branch 'ak/submodule-foreach-quoting'
blob
|
diff
|
raw
2013-11-18
Merge branch 'jx/branch-vv-always-compare-with-upstream'
blob
|
diff
|
raw
2013-11-08
Merge branch 'jc/upload-pack-send-symref' into maint
blob
|
diff
|
raw
2013-11-08
Merge branch 'jk/http-auth-redirects' into maint
blob
|
diff
|
raw
2013-11-07
Merge branch 'sc/doc-howto-dumb-http' into maint
blob
|
diff
|
raw
2013-11-07
Merge branch 'vd/doc-unpack-objects' into maint
blob
|
diff
|
raw
2013-11-07
Merge branch 'jk/subtree-install-fix' into maint
blob
|
diff
|
raw
2013-11-07
Merge branch 'hn/log-graph-color-octopus' into maint
blob
|
diff
|
raw
2013-11-07
Merge branch 'mm/checkout-auto-track-fix' into maint
blob
|
diff
|
raw
2013-11-07
Merge branch 'sg/prompt-svn-remote-fix' into maint
blob
|
diff
|
raw
2013-11-07
Merge branch 'jk/split-broken-ident' into maint
blob
|
diff
|
raw
2013-11-07
Merge branch 'jc/revision-range-unpeel' into maint
blob
|
diff
|
raw
2013-11-04
Merge branch 'vd/doc-unpack-objects'
blob
|
diff
|
raw
2013-11-04
Merge branch 'jk/duplicate-objects-in-packs'
blob
|
diff
|
raw
2013-11-04
Merge branch 'jk/subtree-install-fix'
blob
|
diff
|
raw
2013-11-04
Merge branch 'ak/cvsserver-stabilize-use-of-hash-keys'
blob
|
diff
|
raw
2013-11-04
Merge branch 'sc/doc-howto-dumb-http'
blob
|
diff
|
raw
2013-11-01
Merge branch 'rs/web-browse-xdg-open'
blob
|
diff
|
raw
2013-11-01
Merge branch 'jk/for-each-ref-skip-parsing'
blob
|
diff
|
raw
2013-11-01
Merge branch 'jl/submodule-mv'
blob
|
diff
|
raw
2013-10-30
Merge branch 'jk/refs-c-squelch-gcc'
blob
|
diff
|
raw
2013-10-30
Merge branch 'jk/date-c-double-semicolon'
blob
|
diff
|
raw
2013-10-30
Merge branch 'nd/magic-pathspec'
blob
|
diff
|
raw
2013-10-30
Merge branch 'nd/gc-lock-against-each-other'
blob
|
diff
|
raw
2013-10-30
Merge branch 'hn/log-graph-color-octopus'
blob
|
diff
|
raw
2013-10-30
Merge branch 'mm/checkout-auto-track-fix'
blob
|
diff
|
raw
2013-10-30
Merge branch 'sg/t3600-nul-sha1-fix'
blob
|
diff
|
raw
2013-10-30
Merge branch 'fc/styles'
blob
|
diff
|
raw
2013-10-30
Merge branch 'jc/upload-pack-send-symref'
blob
|
diff
|
raw
2013-10-30
Merge branch 'jk/http-auth-redirects'
blob
|
diff
|
raw
2013-10-28
Merge branch 'sb/repack-in-c'
blob
|
diff
|
raw
2013-10-28
Merge branch 'sg/prompt-svn-remote-fix'
blob
|
diff
|
raw
2013-10-28
Merge branch 'jk/split-broken-ident'
blob
|
diff
|
raw
2013-10-28
Merge branch 'jk/remote-literal-string-leakfix'
blob
|
diff
|
raw
2013-10-28
Merge branch 'ew/keepalive'
blob
|
diff
|
raw
2013-10-28
Merge branch 'jc/revision-range-unpeel'
blob
|
diff
|
raw
2013-10-28
Merge branch 'jx/relative-path-regression-fix'
blob
|
diff
|
raw
2013-10-28
Merge branch 'jk/clone-progress-to-stderr' into maint
blob
|
diff
|
raw
2013-10-28
Merge branch 'jk/format-patch-from' into maint
blob
|
diff
|
raw
2013-10-28
Merge branch 'jk/shortlog-tolerate-broken-commit' into...
blob
|
diff
|
raw
2013-10-28
Merge branch 'jk/diff-algo' into maint
blob
|
diff
|
raw
2013-10-23
Merge branch 'jc/ls-files-killed-optim' into maint
blob
|
diff
|
raw
2013-10-23
Merge branch 'jh/checkout-auto-tracking' into maint
blob
|
diff
|
raw
2013-10-23
Merge branch 'nd/fetch-into-shallow' into maint
blob
|
diff
|
raw
2013-10-23
Merge branch 'bc/gnome-keyring'
blob
|
diff
|
raw
2013-10-23
Merge branch 'po/dot-url'
blob
|
diff
|
raw
2013-10-23
Merge branch 'jc/prompt-upstream'
blob
|
diff
|
raw
2013-10-23
Merge branch 'hu/cherry-pick-previous-branch'
blob
|
diff
|
raw
2013-10-23
Merge branch 'mg/more-textconv'
blob
|
diff
|
raw
2013-10-23
Merge branch 'jc/pack-objects'
blob
|
diff
|
raw
2013-10-18
Merge branch 'maint'
blob
|
diff
|
raw
2013-10-18
Merge branch 'jc/reflog-doc'
blob
|
diff
|
raw
|
diff to current
2013-10-18
Merge branch 'sb/repack-in-c'
blob
|
diff
|
raw
|
diff to current
2013-10-18
Merge branch 'jk/clone-progress-to-stderr'
blob
|
diff
|
raw
|
diff to current
2013-10-18
git-merge: document the -S option
blob
|
diff
|
raw
2013-10-17
Merge branch 'jk/format-patch-from'
blob
|
diff
|
raw
|
diff to current
2013-10-17
Merge branch 'jk/upload-pack-keepalive' into maint
blob
|
diff
|
raw
|
diff to current
2013-10-17
Merge branch 'bc/http-backend-allow-405' into maint
blob
|
diff
|
raw
|
diff to current
2013-10-17
Merge branch 'jc/cvsserver-perm-bit-fix' into maint
blob
|
diff
|
raw
|
diff to current
2013-10-17
Merge branch 'js/add-i-mingw' into maint
blob
|
diff
|
raw
|
diff to current
2013-10-17
Merge branch 'nd/git-dir-pointing-at-gitfile' into...
blob
|
diff
|
raw
|
diff to current
2013-10-17
Merge branch 'jk/has-sha1-file-retry-packed' into maint
blob
|
diff
|
raw
|
diff to current
2013-10-17
Merge branch 'ap/commit-author-mailmap' into maint
blob
|
diff
|
raw
|
diff to current
2013-10-17
Merge branch 'es/rebase-i-no-abbrev' into maint
blob
|
diff
|
raw
|
diff to current
2013-10-17
Merge branch 'rt/rebase-p-no-merge-summary' into maint
blob
|
diff
|
raw
|
diff to current
2013-10-17
Merge branch 'es/rebase-i-respect-core-commentchar...
blob
|
diff
|
raw
|
diff to current
2013-10-14
Merge branch 'rj/highlight-test-hang'
blob
|
diff
|
raw
|
diff to current
2013-10-14
Merge branch 'nv/doc-config-signingkey'
blob
|
diff
|
raw
|
diff to current
2013-10-14
Merge branch 'nd/clone-local-with-colon'
blob
|
diff
|
raw
|
diff to current
2013-10-14
Merge branch 'jx/clean-interactive'
blob
|
diff
|
raw
|
diff to current
2013-10-14
Merge branch 'jk/diff-algo'
blob
|
diff
|
raw
|
diff to current
2013-10-08
Merge branch 'tz/credential-netrc'
blob
|
diff
|
raw
|
diff to current
2013-09-26
Merge branch 'mm/rebase-continue-freebsd-WB' into maint
blob
|
diff
|
raw
|
diff to current
2013-09-26
Merge branch 'km/svn-1.8-serf-only' into maint
blob
|
diff
|
raw
|
diff to current
2013-09-26
Merge branch 'js/xread-in-full' into maint
blob
|
diff
|
raw
|
diff to current
2013-09-26
Merge branch 'bc/send-email-ssl-die-message-fix' into...
blob
|
diff
|
raw
|
diff to current
2013-09-25
Merge branch 'bc/submodule-status-ignored'
blob
|
diff
|
raw
|
diff to current
2013-09-25
Merge branch 'cc/replace-with-the-same-type'
blob
|
diff
|
raw
|
diff to current
2013-09-25
Merge branch 'nd/unpack-entry-optim-in-pack-objects'
blob
|
diff
|
raw
|
diff to current
2013-09-25
Merge branch 'jk/shortlog-tolerate-broken-commit'
blob
|
diff
|
raw
|
diff to current
2013-09-25
Merge branch 'jc/strcasecmp-pure-inline'
blob
|
diff
|
raw
|
diff to current
2013-09-25
Merge branch 'nd/fetch-pack-error-reporting-fix'
blob
|
diff
|
raw
|
diff to current
2013-09-25
Merge branch 'jc/push-cas'
blob
|
diff
|
raw
|
diff to current
2013-09-20
Merge branch 'jk/upload-pack-keepalive'
blob
|
diff
|
raw
|
diff to current
2013-09-20
Merge branch 'fc/at-head'
blob
|
diff
|
raw
|
diff to current
2013-09-20
Merge branch 'dw/check-ignore-sans-index'
blob
|
diff
|
raw
|
diff to current
2013-09-20
Merge branch 'mm/commit-template-squelch-advice-messages'
blob
|
diff
|
raw
|
diff to current
2013-09-20
Merge branch 'bk/refs-multi-update'
blob
|
diff
|
raw
|
diff to current
2013-09-20
Merge branch 'nr/git-cd-to-a-directory'
blob
|
diff
|
raw
|
diff to current
2013-09-20
Merge branch 'mm/rebase-continue-freebsd-WB'
blob
|
diff
|
raw
|
diff to current
2013-09-20
Merge branch 'jh/checkout-auto-tracking'
blob
|
diff
|
raw
|
diff to current
2013-09-20
Merge branch 'bc/http-backend-allow-405'
blob
|
diff
|
raw
|
diff to current
2013-09-20
Merge branch 'np/lookup-object-hashing'
blob
|
diff
|
raw
|
diff to current
next