Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
Documentation: simplify How Merge Works
[gitweb.git]
/
Documentation
/
git-merge.txt
2010-01-24
Documentation: simplify How Merge Works
blob
|
diff
|
raw
2010-01-24
Documentation: merge: add a section about fast-forward
blob
|
diff
|
raw
|
diff to current
2010-01-24
Documentation: emphasize when git merge terminates...
blob
|
diff
|
raw
|
diff to current
2010-01-24
Documentation: merge: add an overview
blob
|
diff
|
raw
|
diff to current
2010-01-24
Documentation: merge: move merge strategy list to end
blob
|
diff
|
raw
|
diff to current
2010-01-24
Documentation: suggest `reset --merge` in How Merge...
blob
|
diff
|
raw
|
diff to current
2010-01-24
Documentation: merge: move configuration section to end
blob
|
diff
|
raw
|
diff to current
2010-01-10
Documentation: spell 'git cmd' without dash throughout
blob
|
diff
|
raw
|
diff to current
2010-01-10
Documentation: format full commands in typewriter font
blob
|
diff
|
raw
|
diff to current
2010-01-09
Documentation: warn prominently against merging with...
blob
|
diff
|
raw
|
diff to current
2010-01-09
Documentation/git-merge: reword references to "remote...
blob
|
diff
|
raw
|
diff to current
2009-12-31
Merge branch 'maint-1.6.0' into maint
blob
|
diff
|
raw
|
diff to current
2009-12-30
Merge branch 'maint-1.6.1' into maint
blob
|
diff
|
raw
|
diff to current
2009-12-30
Merge branch 'maint-1.6.0' into maint-1.6.1
blob
|
diff
|
raw
|
diff to current
2009-12-28
Merge branch 'jk/1.7.0-status'
blob
|
diff
|
raw
|
diff to current
2009-12-27
Merge branch 'nf/maint-fix-index-ext-len-on-be64' into...
blob
|
diff
|
raw
|
diff to current
2009-12-26
Merge branch 'jc/1.7.0-diff-whitespace-only-status'
blob
|
diff
|
raw
|
diff to current
2009-12-26
Merge branch 'jc/1.7.0-push-safety'
blob
|
diff
|
raw
|
diff to current
2009-12-26
Merge branch 'jc/1.7.0-send-email-no-thread-default'
blob
|
diff
|
raw
|
diff to current
2009-12-26
Merge branch 'sr/vcs-helper'
blob
|
diff
|
raw
|
diff to current
2009-12-09
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2009-12-09
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2009-12-09
Merge branch 'mm/maint-merge-ff-error-message-fix'...
blob
|
diff
|
raw
|
diff to current
2009-12-09
Merge branch 'jk/maint-add-p-delete-fix' into maint
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'uk/maint-shortlog-encoding' into maint
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'fc/maint-format-patch-pathspec-dashes...
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'ap/maint-merge-strategy-list-fix' into...
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'jc/maint-am-keep' into maint
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'rs/work-around-grep-opt-insanity' into...
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'rj/maint-cygwin-count-objects' into maint
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'mm/maint-hint-failed-merge' into maint
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'th/maint-remote-update-help-string' into...
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'rj/maint-t9700' into maint
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'ls/maint-mailinfo-no-inbody' into maint
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'mo/maint-crlf-doc' into maint
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'th/remote-usage' into maint
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'pb/maint-use-custom-perl' into maint
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'mm/config-pathname-tilde-expand' into...
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'bc/grep-i-F' into maint
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'jk/maint-break-rename-reduce-memory'...
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'rj/maint-simplify-cygwin-makefile' into...
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'rg/doc-workflow' into maint
blob
|
diff
|
raw
|
diff to current
2009-12-03
Merge branch 'np/maint-sideband-favor-status' into...
blob
|
diff
|
raw
|
diff to current
2009-12-01
Merge branch 'jc/deprecate-old-syntax-from-merge'
blob
|
diff
|
raw
|
diff to current
2009-12-01
Merge branch 'jn/gitweb-blame'
blob
|
diff
|
raw
|
diff to current
2009-11-30
Merge branch 'fc/maint-format-patch-pathspec-dashes'
blob
|
diff
|
raw
|
diff to current
2009-11-30
Merge branch 'mm/maint-merge-ff-error-message-fix'
blob
|
diff
|
raw
|
diff to current
2009-11-30
Merge branch 'ap/maint-merge-strategy-list-fix'
blob
|
diff
|
raw
|
diff to current
2009-11-30
Merge branch 'jc/pretty-lf'
blob
|
diff
|
raw
|
diff to current
2009-11-30
Merge branch 'jc/mailinfo-remove-brackets'
blob
|
diff
|
raw
|
diff to current
2009-11-30
Merge branch 'fc/send-email-envelope'
blob
|
diff
|
raw
|
diff to current
2009-11-30
Merge branch 'uk/maint-shortlog-encoding'
blob
|
diff
|
raw
|
diff to current
2009-11-30
Merge branch 'jc/maint-am-keep'
blob
|
diff
|
raw
|
diff to current
2009-11-25
Merge branch 'rs/work-around-grep-opt-insanity'
blob
|
diff
|
raw
|
diff to current
2009-11-24
Merge branch 'rj/maint-cygwin-count-objects'
blob
|
diff
|
raw
|
diff to current
2009-11-24
Merge branch 'mm/maint-hint-failed-merge'
blob
|
diff
|
raw
|
diff to current
2009-11-24
Merge branch 'mr/gitweb-snapshot'
blob
|
diff
|
raw
|
diff to current
2009-11-23
Merge branch 'bg/fetch-multi'
blob
|
diff
|
raw
|
diff to current
2009-11-23
Merge branch 'th/maint-remote-update-help-string'
blob
|
diff
|
raw
|
diff to current
2009-11-23
Merge branch 'jn/faster-completion-startup'
blob
|
diff
|
raw
|
diff to current
2009-11-23
Merge branch 'rj/maint-t9700'
blob
|
diff
|
raw
|
diff to current
2009-11-23
Merge branch 'ls/maint-mailinfo-no-inbody'
blob
|
diff
|
raw
|
diff to current
2009-11-23
Merge branch 'mo/maint-crlf-doc'
blob
|
diff
|
raw
|
diff to current
2009-11-23
Merge branch 'th/remote-usage'
blob
|
diff
|
raw
|
diff to current
2009-11-23
Merge branch 'pb/maint-use-custom-perl'
blob
|
diff
|
raw
|
diff to current
2009-11-23
Merge branch 'mm/config-pathname-tilde-expand'
blob
|
diff
|
raw
|
diff to current
2009-11-23
Merge branch 'bc/grep-i-F'
blob
|
diff
|
raw
|
diff to current
2009-11-23
Merge branch 'jk/maint-break-rename-reduce-memory'
blob
|
diff
|
raw
|
diff to current
2009-11-23
Merge branch 'tr/maint-merge-ours-clarification' (early...
blob
|
diff
|
raw
|
diff to current
2009-11-21
Merge branch 'jc/fix-tree-walk' (early part)
blob
|
diff
|
raw
|
diff to current
2009-11-21
Merge branch 'jh/notes' (early part)
blob
|
diff
|
raw
|
diff to current
2009-11-21
Merge branch 'sp/smart-http'
blob
|
diff
|
raw
|
diff to current
2009-11-21
Merge branch 'jn/editor-pager'
blob
|
diff
|
raw
|
diff to current
2009-11-21
Merge branch 'rj/cygwin-msvc'
blob
|
diff
|
raw
|
diff to current
2009-11-21
Merge branch 'rj/maint-simplify-cygwin-makefile'
blob
|
diff
|
raw
|
diff to current
2009-11-21
Merge branch 'bg/format-patch-doc-update'
blob
|
diff
|
raw
|
diff to current
2009-11-21
Merge branch 'tr/filter-branch'
blob
|
diff
|
raw
|
diff to current
2009-11-21
Merge branch 'sc/protocol-doc'
blob
|
diff
|
raw
|
diff to current
2009-11-21
Merge branch 'jl/submodule-add-noname'
blob
|
diff
|
raw
|
diff to current
2009-11-21
Merge branch 'sb/ls-tree-parseopt'
blob
|
diff
|
raw
|
diff to current
2009-11-21
Merge branch 'rg/doc-workflow'
blob
|
diff
|
raw
|
diff to current
2009-11-21
Merge branch 'jp/fetch-cull-many-refs'
blob
|
diff
|
raw
|
diff to current
2009-11-18
Merge branch 'np/maint-sideband-favor-status'
blob
|
diff
|
raw
|
diff to current
2009-11-18
Merge branch 'ef/msys-imap'
blob
|
diff
|
raw
|
diff to current
2009-11-16
Merge branch 'bs/maint-pre-commit-hook-sample' into...
blob
|
diff
|
raw
|
diff to current
2009-11-16
Merge branch 'jk/maint-add-p-empty' into maint
blob
|
diff
|
raw
|
diff to current
2009-11-16
Merge branch 'js/maint-diff-color-words' into maint
blob
|
diff
|
raw
|
diff to current
2009-11-16
Merge branch 'tz/maint-rpm' into maint
blob
|
diff
|
raw
|
diff to current
2009-11-16
Merge branch 'jk/maint-format-patch-p-suppress-stat...
blob
|
diff
|
raw
|
diff to current
2009-11-16
Merge branch 'pb/maint-gitweb-blob-lineno' into maint
blob
|
diff
|
raw
|
diff to current
2009-11-16
Merge branch 'jk/maint-1.6.3-ls-files-i' into maint
blob
|
diff
|
raw
|
diff to current
2009-11-16
Merge branch 'vl/maint-openssl-signature-change' into...
blob
|
diff
|
raw
|
diff to current
2009-11-16
Merge branch 'jk/maint-push-config' into maint
blob
|
diff
|
raw
|
diff to current
2009-11-16
Merge branch 'sr/blame-incomplete' into maint
blob
|
diff
|
raw
|
diff to current
2009-11-16
Merge branch 'jc/maint-blank-at-eof' into maint
blob
|
diff
|
raw
|
diff to current
2009-11-16
Merge branch 'bs/maint-pre-commit-hook-sample'
blob
|
diff
|
raw
|
diff to current
2009-11-16
Merge branch 'js/maint-diff-color-words'
blob
|
diff
|
raw
|
diff to current
2009-11-16
Merge branch 'rs/pretty-wrap'
blob
|
diff
|
raw
|
diff to current
2009-11-16
Merge branch 'js/log-rewrap'
blob
|
diff
|
raw
|
diff to current
2009-11-16
Merge branch 'fc/doc-fast-forward'
blob
|
diff
|
raw
|
diff to current
next