Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
Merge branch 'as/dir-c-cleanup'
[gitweb.git]
/
Documentation
/
git-merge.txt
2013-01-10
Merge branch 'as/dir-c-cleanup'
blob
|
diff
|
raw
2013-01-10
Merge branch 'nd/wildmatch'
blob
|
diff
|
raw
2013-01-10
Merge branch 'aw/rebase-am-failure-detection'
blob
|
diff
|
raw
2013-01-10
Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit'
blob
|
diff
|
raw
2013-01-09
Merge branch 'nd/maint-branch-desc-doc'
blob
|
diff
|
raw
2013-01-09
Merge branch 'os/gitweb-highlight-uncaptured'
blob
|
diff
|
raw
2013-01-09
Merge branch 'jn/less-reconfigure'
blob
|
diff
|
raw
2013-01-08
Merge branch 'kb/maint-bundle-doc'
blob
|
diff
|
raw
2013-01-08
Merge branch 'ta/remove-stale-translated-tut'
blob
|
diff
|
raw
2013-01-08
Merge branch 'tb/test-t9020-no-which'
blob
|
diff
|
raw
2013-01-08
Merge branch 'jk/maint-fast-import-doc-dedup-done'
blob
|
diff
|
raw
2013-01-08
Merge branch 'jc/mkstemp-more-careful-error-reporting...
blob
|
diff
|
raw
2013-01-07
Merge branch 'mz/oneway-merge-wo-u-no-lstat'
blob
|
diff
|
raw
2013-01-07
Merge branch 'jn/warn-on-inaccessible-loosen'
blob
|
diff
|
raw
2013-01-07
Merge branch 'jc/apply-trailing-blank-removal'
blob
|
diff
|
raw
2013-01-06
Merge branch 'jk/fsck-dot-in-trees'
blob
|
diff
|
raw
2013-01-03
Merge branch 'as/test-tweaks'
blob
|
diff
|
raw
2013-01-03
Merge branch 'jc/same-encoding'
blob
|
diff
|
raw
2013-01-02
Merge branch 'sp/shortlog-missing-lf'
blob
|
diff
|
raw
2013-01-02
Merge branch 'nd/invalidate-i-t-a-cache-tree'
blob
|
diff
|
raw
2013-01-02
Merge branch 'jk/repack-ref-racefix'
blob
|
diff
|
raw
2013-01-02
Merge branch 'mk/maint-graph-infinity-loop'
blob
|
diff
|
raw
2013-01-02
Merge branch 'jc/mkstemp-more-careful-error-reporting'
blob
|
diff
|
raw
2013-01-02
Merge branch 'mh/ceiling'
blob
|
diff
|
raw
2012-12-28
Merge branch 'so/prompt-command'
blob
|
diff
|
raw
2012-12-27
Merge branch 'gb/maint-doc-svn-log-window-size' into...
blob
|
diff
|
raw
2012-12-27
Merge branch 'km/maint-doc-git-reset' into maint
blob
|
diff
|
raw
2012-12-27
Merge branch 'tj/maint-doc-commit-sign' into maint
blob
|
diff
|
raw
2012-12-23
Merge branch 'jc/doc-diff-blobs' into maint
blob
|
diff
|
raw
2012-12-23
Merge branch 'nd/index-format-doc' into maint
blob
|
diff
|
raw
2012-12-23
Merge branch 'ta/doc-cleanup' into maint
blob
|
diff
|
raw
2012-12-21
Merge branch 'jc/doc-diff-blobs'
blob
|
diff
|
raw
2012-12-21
Merge branch 'nd/index-format-doc'
blob
|
diff
|
raw
2012-12-18
Merge branch 'jk/pickaxe-textconv' into maint
blob
|
diff
|
raw
2012-12-12
Merge branch 'so/prompt-command'
blob
|
diff
|
raw
2012-12-11
Merge branch 'ef/mingw-rmdir'
blob
|
diff
|
raw
2012-12-07
Merge branch 'jc/same-encoding' into maint
blob
|
diff
|
raw
2012-12-07
Merge branch 'lt/diff-stat-show-0-lines' into maint
blob
|
diff
|
raw
2012-12-04
Merge branch 'mm/status-push-pull-advise'
blob
|
diff
|
raw
2012-12-03
Merge branch 'mm/status-push-pull-advise'
blob
|
diff
|
raw
2012-11-29
Merge branch 'lt/diff-stat-show-0-lines'
blob
|
diff
|
raw
2012-11-29
Merge branch 'fc/remote-hg'
blob
|
diff
|
raw
2012-11-29
Merge branch 'mk/complete-tcsh'
blob
|
diff
|
raw
2012-11-29
Merge branch 'jl/submodule-rm'
blob
|
diff
|
raw
2012-11-29
Merge branch 'fc/completion-test-simplification'
blob
|
diff
|
raw
2012-11-28
Merge branch 'mm/status-push-pull-advise'
blob
|
diff
|
raw
2012-11-28
Merge branch 'jk/pickaxe-textconv'
blob
|
diff
|
raw
2012-11-28
Merge branch 'rh/maint-gitweb-highlight-ext' into maint
blob
|
diff
|
raw
2012-11-28
Merge branch 'pw/maint-p4-rcs-expansion-newline' into...
blob
|
diff
|
raw
2012-11-27
Merge branch 'nd/maint-compat-fnmatch-fix' into maint
blob
|
diff
|
raw
2012-11-27
Merge branch 'jh/update-ref-d-through-symref' into...
blob
|
diff
|
raw
2012-11-27
Merge branch 'esr/maint-doc-fast-import' into maint
blob
|
diff
|
raw
2012-11-27
Merge branch 'wtk/submodule-doc-fixup' into maint
blob
|
diff
|
raw
2012-11-26
Merge branch 'nd/maint-compat-fnmatch-fix'
blob
|
diff
|
raw
2012-11-26
Merge branch 'bc/do-not-recurse-in-die'
blob
|
diff
|
raw
2012-11-26
Merge branch 'mk/complete-tcsh'
blob
|
diff
|
raw
2012-11-26
Merge branch 'jh/update-ref-d-through-symref'
blob
|
diff
|
raw
2012-11-26
Merge branch 'lt/diff-stat-show-0-lines'
blob
|
diff
|
raw
2012-11-26
Merge branch 'sg/complete-help-undup'
blob
|
diff
|
raw
2012-11-26
Merge branch 'jk/checkout-out-of-unborn' into maint
blob
|
diff
|
raw
2012-11-26
Merge branch 'cn/config-missing-path' into maint
blob
|
diff
|
raw
2012-11-26
Merge branch 'jk/maint-gitweb-xss' into maint
blob
|
diff
|
raw
2012-11-21
Merge branch 'esr/maint-doc-fast-import'
blob
|
diff
|
raw
2012-11-21
Merge branch 'wtk/submodule-doc-fixup'
blob
|
diff
|
raw
2012-11-21
Merge branch 'so/prompt-command'
blob
|
diff
|
raw
2012-11-21
Merge branch 'jk/config-ignore-duplicates'
blob
|
diff
|
raw
2012-11-21
Merge branch 'jk/maint-http-half-auth-fetch'
blob
|
diff
|
raw
2012-11-20
Merge branch 'jk/checkout-out-of-unborn'
blob
|
diff
|
raw
2012-11-20
Merge branch 'cn/config-missing-path'
blob
|
diff
|
raw
2012-11-20
Merge branch 'jl/submodule-rm'
blob
|
diff
|
raw
2012-11-20
Merge branch 'jk/maint-gitweb-xss'
blob
|
diff
|
raw
2012-11-20
Merge branch 'rh/maint-gitweb-highlight-ext'
blob
|
diff
|
raw
2012-11-20
Merge branch 'pw/maint-p4-rcs-expansion-newline'
blob
|
diff
|
raw
2012-11-20
Merge branch 'ta/doc-cleanup'
blob
|
diff
|
raw
2012-11-20
Merge branch 'kb/preload-index-more'
blob
|
diff
|
raw
2012-11-20
Merge branch 'jk/maint-http-half-auth-fetch'
blob
|
diff
|
raw
2012-11-20
Merge branch 'mg/maint-pull-suggest-upstream-to' into...
blob
|
diff
|
raw
2012-11-20
Merge branch 'mm/maint-doc-commit-edit' into maint
blob
|
diff
|
raw
2012-11-20
Merge branch 'as/maint-doc-fix-no-post-rewrite' into...
blob
|
diff
|
raw
2012-11-20
Merge branch 'rs/lock-correct-ref-during-delete' into...
blob
|
diff
|
raw
2012-11-20
Merge branch 'rf/maint-mailmap-off-by-one' into maint
blob
|
diff
|
raw
2012-11-20
Merge branch 'jk/maint-diff-grep-textconv' into maint
blob
|
diff
|
raw
2012-11-20
Merge branch 'js/format-2047' into maint
blob
|
diff
|
raw
2012-11-19
Merge branch 'sz/maint-curl-multi-timeout' into maint
blob
|
diff
|
raw
2012-11-19
Merge branch 'po/maint-refs-replace-docs' into maint
blob
|
diff
|
raw
2012-11-19
Merge branch 'ph/pull-rebase-detached' into maint
blob
|
diff
|
raw
2012-11-19
Merge branch 'mm/maint-doc-remote-tracking' into maint
blob
|
diff
|
raw
2012-11-19
Merge branch 'jc/test-say-color-avoid-echo-escape'...
blob
|
diff
|
raw
|
diff to current
2012-11-15
Merge branch 'jc/prettier-pretty-note'
blob
|
diff
|
raw
2012-11-15
Merge branch 'mg/maint-pull-suggest-upstream-to'
blob
|
diff
|
raw
2012-11-15
Merge branch 'mh/notes-string-list'
blob
|
diff
|
raw
2012-11-15
Merge branch 'mh/strbuf-split'
blob
|
diff
|
raw
2012-11-15
Merge branch 'mm/maint-doc-commit-edit'
blob
|
diff
|
raw
2012-11-15
Merge branch 'as/maint-doc-fix-no-post-rewrite'
blob
|
diff
|
raw
2012-11-15
Merge branch 'js/hp-nonstop'
blob
|
diff
|
raw
2012-11-15
Merge branch 'cr/cvsimport-local-zone'
blob
|
diff
|
raw
2012-11-15
Merge branch 'jc/same-encoding'
blob
|
diff
|
raw
2012-11-15
Merge branch 'ph/submodule-sync-recursive'
blob
|
diff
|
raw
2012-11-15
Merge branch 'jk/maint-diff-grep-textconv'
blob
|
diff
|
raw
2012-11-15
Merge branch 'jh/symbolic-ref-d'
blob
|
diff
|
raw
next