Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
merge-recursive --renormalize
[gitweb.git]
/
Documentation
/
merge-options.txt
2010-06-22
Merge branch 'tc/commit-abbrev-fix' into maint
blob
|
diff
|
raw
2010-06-22
Merge branch 'cc/maint-diff-CC-binary' into maint
blob
|
diff
|
raw
2010-06-22
Merge branch 'pc/remove-warn' into maint
blob
|
diff
|
raw
2010-06-21
Merge branch 'js/maint-receive-pack-symref-alias'
blob
|
diff
|
raw
2010-06-21
Merge branch 'eb/core-eol'
blob
|
diff
|
raw
2010-06-21
Merge branch 'fg/autocrlf'
blob
|
diff
|
raw
2010-06-21
Merge branch 'tc/commit-abbrev-fix'
blob
|
diff
|
raw
2010-06-21
Merge branch 'tr/receive-pack-aliased-update-fix'
blob
|
diff
|
raw
2010-06-21
Merge branch 'js/async-thread'
blob
|
diff
|
raw
2010-06-21
Merge branch 'cb/assume-unchanged-fix' into maint
blob
|
diff
|
raw
2010-06-21
Merge branch 'rs/diff-no-minimal' into maint
blob
|
diff
|
raw
2010-06-21
Merge branch 'bg/apply-blank-trailing-context' into...
blob
|
diff
|
raw
2010-06-18
Merge branch 'cc/maint-diff-CC-binary'
blob
|
diff
|
raw
2010-06-18
Merge branch 'rc/ls-remote-default'
blob
|
diff
|
raw
2010-06-18
Merge branch 'hg/id-munging'
blob
|
diff
|
raw
2010-06-16
Merge branch 'cw/maint-exec-defpath' into maint
blob
|
diff
|
raw
2010-06-16
Merge branch 'sc/http-late-auth' into maint
blob
|
diff
|
raw
2010-06-16
Merge branch 'cb/maint-stash-orphaned-file' into maint
blob
|
diff
|
raw
2010-06-16
Merge branch 'jn/maint-bundle' into maint
blob
|
diff
|
raw
2010-06-16
Merge branch 'rr/doc-submitting' into maint
blob
|
diff
|
raw
2010-06-16
Merge branch 'jn/t7006-fixup' into maint
blob
|
diff
|
raw
2010-06-16
Merge branch 'jn/shortlog' into maint
blob
|
diff
|
raw
2010-06-16
Merge branch 'np/index-pack-memsave' into maint
blob
|
diff
|
raw
2010-06-16
Merge branch 'sp/maint-dumb-http-pack-reidx' into maint
blob
|
diff
|
raw
2010-06-16
Merge branch 'jc/am-3-show-corrupted-patch' into maint
blob
|
diff
|
raw
2010-06-16
Merge branch 'sp/maint-describe-tiebreak-with-tagger...
blob
|
diff
|
raw
2010-06-16
Merge branch 'np/malloc-threading' into maint
blob
|
diff
|
raw
2010-06-16
Merge branch 'bg/send-email-smtpdomain' into maint
blob
|
diff
|
raw
2010-06-16
Merge branch 'rc/maint-curl-helper' into maint
blob
|
diff
|
raw
2010-06-16
Merge branch 'hg/maint-attr-fix' into maint
blob
|
diff
|
raw
2010-06-16
Merge branch 'mh/status-optionally-refresh' into maint
blob
|
diff
|
raw
2010-06-13
Merge branch 'js/try-to-free-stackable'
blob
|
diff
|
raw
2010-06-13
Merge branch 'cb/assume-unchanged-fix'
blob
|
diff
|
raw
2010-06-13
Merge branch 'rs/diff-no-minimal'
blob
|
diff
|
raw
2010-06-01
Merge branch 'maint-1.7.0' into maint
blob
|
diff
|
raw
2010-05-28
Merge branch 'maint-1.7.0' into maint
blob
|
diff
|
raw
2010-05-21
Merge branch 'cb/maint-stash-orphaned-file'
blob
|
diff
|
raw
2010-05-21
Merge branch 'jn/maint-bundle'
blob
|
diff
|
raw
2010-05-21
Merge branch 'rr/doc-submitting'
blob
|
diff
|
raw
2010-05-21
Merge branch 'jn/gitweb-our-squelch'
blob
|
diff
|
raw
2010-05-21
Merge branch 'jn/shortlog'
blob
|
diff
|
raw
2010-05-21
Merge branch 'jn/t7006-fixup'
blob
|
diff
|
raw
2010-05-21
Merge branch 'js/maint-receive-pack-symref-alias'
blob
|
diff
|
raw
2010-05-21
Merge branch 'sp/maint-dumb-http-pack-reidx'
blob
|
diff
|
raw
2010-05-21
Merge branch 'jn/submodule-basic-test'
blob
|
diff
|
raw
2010-05-21
Merge branch 'np/index-pack-memsave'
blob
|
diff
|
raw
2010-05-21
Merge branch 'jc/am-3-show-corrupted-patch'
blob
|
diff
|
raw
2010-05-21
Merge branch 'jc/maint-no-reflog-expire-unreach-for...
blob
|
diff
|
raw
2010-05-21
Merge branch 'cw/maint-exec-defpath'
blob
|
diff
|
raw
2010-05-21
Merge branch 'tr/word-diff'
blob
|
diff
|
raw
2010-05-21
Merge branch 'sp/maint-describe-tiebreak-with-tagger...
blob
|
diff
|
raw
2010-05-21
Merge branch 'jc/status-show-ignored'
blob
|
diff
|
raw
2010-05-21
Merge branch 'np/malloc-threading'
blob
|
diff
|
raw
2010-05-21
Merge branch 'sr/remote-helper-export'
blob
|
diff
|
raw
2010-05-21
Merge branch 'ld/discovery-limit-to-fs' (early part)
blob
|
diff
|
raw
2010-05-21
Merge branch 'ar/config-from-command-line'
blob
|
diff
|
raw
2010-05-21
Merge branch 'em/checkout-orphan'
blob
|
diff
|
raw
2010-05-09
Merge branch 'bg/apply-blank-trailing-context'
blob
|
diff
|
raw
2010-05-09
Merge branch 'bg/send-email-smtpdomain'
blob
|
diff
|
raw
2010-05-09
Merge branch 'rc/ls-remote-default'
blob
|
diff
|
raw
2010-05-09
Merge branch 'rc/maint-curl-helper'
blob
|
diff
|
raw
2010-05-09
Merge branch 'hg/maint-attr-fix'
blob
|
diff
|
raw
2010-05-09
Merge branch 'eb/unpretty-b-format'
blob
|
diff
|
raw
2010-05-09
Merge branch 'ab/commit-empty-message'
blob
|
diff
|
raw
2010-05-09
Merge branch 'jc/test-sleepless'
blob
|
diff
|
raw
2010-05-09
Merge branch 'jc/maint-reflog-expire-unreachable'
blob
|
diff
|
raw
2010-05-09
Merge branch 'sd/log-decorate'
blob
|
diff
|
raw
2010-05-09
Merge branch 'mh/status-optionally-refresh'
blob
|
diff
|
raw
2010-05-09
Merge branch 'cw/ws-indent-with-tab'
blob
|
diff
|
raw
2010-05-09
Merge branch 'cc/revert-strategy'
blob
|
diff
|
raw
2010-05-09
Merge branch 'sc/http-late-auth'
blob
|
diff
|
raw
2010-05-09
Merge branch 'jk/cached-textconv'
blob
|
diff
|
raw
2010-05-09
Merge branch 'pc/remove-warn'
blob
|
diff
|
raw
2010-05-08
Merge branch 'jn/maint-request-pull' into jn/request...
blob
|
diff
|
raw
2010-05-04
Merge branch 'maint-1.7.0' into maint
blob
|
diff
|
raw
2010-05-02
Merge branch 'maint'
blob
|
diff
|
raw
2010-04-24
Merge branch 'maint'
blob
|
diff
|
raw
2010-04-23
Sync with 1.7.0.6
blob
|
diff
|
raw
2010-04-23
Merge branch 'mg/use-default-abbrev-length-in-rev-list...
blob
|
diff
|
raw
|
diff to current
2010-04-23
Merge branch 'jk/maint-diffstat-overflow' into maint
blob
|
diff
|
raw
|
diff to current
2010-04-23
Merge branch 'da/maint-python-startup' into maint
blob
|
diff
|
raw
|
diff to current
2010-04-22
Merge branch 'maint'
blob
|
diff
|
raw
2010-04-20
Merge branch 'maint'
blob
|
diff
|
raw
2010-04-19
Merge branch 'maint-1.6.6' into maint
blob
|
diff
|
raw
|
diff to current
2010-04-19
Merge branch 'rr/remote-helper-doc'
blob
|
diff
|
raw
2010-04-19
Merge branch 'wp/doc-filter-direction'
blob
|
diff
|
raw
2010-04-19
Merge branch 'jk/maint-diffstat-overflow'
blob
|
diff
|
raw
2010-04-19
Merge branch 'jg/auto-initialize-notes-with-percent...
blob
|
diff
|
raw
2010-04-19
Merge branch 'maint'
blob
|
diff
|
raw
2010-04-19
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
2010-04-17
Merge branch 'maint'
blob
|
diff
|
raw
2010-04-14
Merge branch 'maint'
blob
|
diff
|
raw
2010-04-12
Docs: Add -X option to git-merge's synopsis.
blob
|
diff
|
raw
|
diff to current
2010-04-11
Merge branch 'jl/maint-submodule-gitfile-awareness'
blob
|
diff
|
raw
|
diff to current
2010-04-11
Sync with 1.7.0.5
blob
|
diff
|
raw
|
diff to current
2010-04-11
Merge branch 'rc/maint-reflog-msg-for-forced-branch...
blob
|
diff
|
raw
|
diff to current
2010-04-10
Merge branch 'jl/maint-submodule-gitfile-awareness'
blob
|
diff
|
raw
|
diff to current
2010-04-10
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2010-04-10
Merge branch 'jc/conflict-marker-size' into maint
blob
|
diff
|
raw
|
diff to current
2010-04-10
Merge branch 'mg/maint-send-email-lazy-editor' into...
blob
|
diff
|
raw
|
diff to current
next