Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
Documentation/gitdiffcore: Remove misleading date in heading
[gitweb.git]
/
Documentation
/
merge-strategies.txt
2010-03-07
Merge branch 'jc/maint-fix-test-perm' into maint-1.6.6
blob
|
diff
|
raw
2010-03-07
Merge branch 'gf/maint-sh-setup-nongit-ok' into maint...
blob
|
diff
|
raw
2010-03-07
Merge branch 'jk/maint-rmdir-fix' into maint-1.6.6
blob
|
diff
|
raw
2010-03-07
Merge branch 'rs/optim-text-wrap' into maint-1.6.6
blob
|
diff
|
raw
2010-03-07
Merge branch 'tr/maint-cherry-pick-list' into maint...
blob
|
diff
|
raw
2010-03-07
Merge branch 'cc/maint-bisect-paths' into maint-1.6.6
blob
|
diff
|
raw
2010-03-05
Merge branch 'maint-1.6.5' into maint-1.6.6
blob
|
diff
|
raw
2010-02-16
Merge branch 'maint-1.6.5' into maint-1.6.6
blob
|
diff
|
raw
2010-02-10
Merge branch 'maint-1.6.5' into maint
blob
|
diff
|
raw
2010-02-10
Merge branch 'gp/maint-cvsserver' into maint
blob
|
diff
|
raw
2010-02-10
Merge branch 'jc/maint-reflog-bad-timestamp' into maint
blob
|
diff
|
raw
2010-02-10
Merge branch 'il/maint-xmallocz' into maint
blob
|
diff
|
raw
2010-02-10
Merge branch 'jh/maint-config-file-prefix' into maint
blob
|
diff
|
raw
2010-02-10
Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge...
blob
|
diff
|
raw
2010-02-09
Merge branch 'maint-1.6.5' into maint
blob
|
diff
|
raw
2010-02-09
Merge branch 'jc/maint-push-doc-status' into maint
blob
|
diff
|
raw
2010-02-08
Merge branch 'jc/maint-imap-config-parse' into maint
blob
|
diff
|
raw
2010-02-08
Merge branch 'jc/maint-doc-git-add-example' into maint
blob
|
diff
|
raw
2010-01-31
Merge commit 'b319ef7' into jc/maint-fix-test-perm
blob
|
diff
|
raw
|
diff to current
2010-01-30
Merge branch 'maint-1.6.5' into maint
blob
|
diff
|
raw
2010-01-24
Merge branch 'maint' of git://git.spearce.org/git-gui...
blob
|
diff
|
raw
2010-01-20
Merge branch 'bg/maint-remote-update-default' into...
blob
|
diff
|
raw
2010-01-20
Merge branch 'sb/maint-octopus' into maint
blob
|
diff
|
raw
2010-01-20
Merge branch 'bg/maint-add-all-doc' into maint
blob
|
diff
|
raw
2010-01-20
Merge branch 'maint-1.6.5' into maint
blob
|
diff
|
raw
2010-01-19
Merge branch 'maint-1.6.2' into maint-1.6.3
blob
|
diff
|
raw
|
diff to current
2010-01-19
Merge branch 'dp/maint-1.6.5-fast-import-non-commit...
blob
|
diff
|
raw
2010-01-19
Merge branch 'jm/maint-1.6.5-grep-NUL-terminate' into...
blob
|
diff
|
raw
2010-01-10
Merge branch 'maint-1.6.2' into maint
blob
|
diff
|
raw
2009-12-31
Merge branch 'maint-1.6.0' into maint
blob
|
diff
|
raw
2009-12-30
Merge branch 'maint-1.6.1' into maint
blob
|
diff
|
raw
2009-12-27
Merge branch 'nf/maint-fix-index-ext-len-on-be64' into...
blob
|
diff
|
raw
2009-12-22
Merge branch 'maint'
blob
|
diff
|
raw
2009-12-20
Merge branch 'maint'
blob
|
diff
|
raw
2009-12-16
Merge branch 'maint' to sync with 1.6.5.7
blob
|
diff
|
raw
2009-12-11
Sync with 1.6.5.6
blob
|
diff
|
raw
2009-12-09
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
2009-12-09
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
2009-12-09
Merge branch 'maint'
blob
|
diff
|
raw
2009-12-05
Sync with 1.6.5.5
blob
|
diff
|
raw
2009-12-03
Merge branch 'maint'
blob
|
diff
|
raw
2009-12-03
Merge branch 'jc/maint-am-keep' 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-03
Merge in 1.6.5.4
blob
|
diff
|
raw
2009-12-03
Merge branch 'maint'
blob
|
diff
|
raw
2009-12-02
Merge branch 'maint'
blob
|
diff
|
raw
2009-12-01
Merge branch 'maint'
blob
|
diff
|
raw
2009-12-01
Merge branch 'jc/deprecate-old-syntax-from-merge'
blob
|
diff
|
raw
2009-12-01
Merge branch 'jn/gitweb-blame'
blob
|
diff
|
raw
2009-11-30
Merge branch 'fc/maint-format-patch-pathspec-dashes'
blob
|
diff
|
raw
2009-11-30
Merge branch 'mm/maint-merge-ff-error-message-fix'
blob
|
diff
|
raw
2009-11-30
Merge branch 'ap/maint-merge-strategy-list-fix'
blob
|
diff
|
raw
2009-11-30
Merge branch 'jc/pretty-lf'
blob
|
diff
|
raw
2009-11-30
Merge branch 'cc/bisect-doc'
blob
|
diff
|
raw
2009-11-30
Merge branch 'em/commit-claim'
blob
|
diff
|
raw
2009-11-30
Merge branch 'jc/mailinfo-remove-brackets'
blob
|
diff
|
raw
2009-11-30
Merge branch 'fc/send-email-envelope'
blob
|
diff
|
raw
2009-11-30
Merge branch 'uk/maint-shortlog-encoding'
blob
|
diff
|
raw
2009-11-30
Merge branch 'jc/maint-am-keep'
blob
|
diff
|
raw
2009-11-27
Merge branch 'maint'
blob
|
diff
|
raw
2009-11-25
Merge branch 'rs/work-around-grep-opt-insanity'
blob
|
diff
|
raw
2009-11-24
Merge branch 'rj/maint-cygwin-count-objects'
blob
|
diff
|
raw
2009-11-24
Merge branch 'rs/color-escape-has-zero-width'
blob
|
diff
|
raw
2009-11-24
Merge branch 'bg/apply-doc'
blob
|
diff
|
raw
2009-11-24
Merge branch 'mm/maint-hint-failed-merge'
blob
|
diff
|
raw
2009-11-24
Merge branch 'jc/log-stdin'
blob
|
diff
|
raw
2009-11-24
Merge branch 'mr/gitweb-snapshot'
blob
|
diff
|
raw
2009-11-24
Merge branch 'cc/replace'
blob
|
diff
|
raw
2009-11-24
Merge branch 'maint'
blob
|
diff
|
raw
2009-11-23
Merge branch 'bg/fetch-multi'
blob
|
diff
|
raw
2009-11-23
Merge branch 'maint'
blob
|
diff
|
raw
2009-11-23
Merge git://git.bogomips.org/git-svn
blob
|
diff
|
raw
2009-11-23
Merge branch 'th/maint-remote-update-help-string'
blob
|
diff
|
raw
2009-11-23
Merge branch 'jn/faster-completion-startup'
blob
|
diff
|
raw
2009-11-23
Merge branch 'rj/maint-t9700'
blob
|
diff
|
raw
2009-11-23
Merge branch 'ls/maint-mailinfo-no-inbody'
blob
|
diff
|
raw
2009-11-23
Merge branch 'mo/maint-crlf-doc'
blob
|
diff
|
raw
2009-11-23
Merge branch 'th/remote-usage'
blob
|
diff
|
raw
2009-11-23
Merge branch 'pb/maint-use-custom-perl'
blob
|
diff
|
raw
2009-11-23
Merge branch 'mm/config-pathname-tilde-expand'
blob
|
diff
|
raw
2009-11-23
Merge branch 'bc/grep-i-F'
blob
|
diff
|
raw
2009-11-23
Merge branch 'jk/maint-break-rename-reduce-memory'
blob
|
diff
|
raw
2009-11-23
Merge branch 'tc/format-attribute'
blob
|
diff
|
raw
2009-11-23
Merge branch 'tr/maint-merge-ours-clarification' (early...
blob
|
diff
|
raw
2009-11-18
Merge branch 'np/maint-sideband-favor-status'
blob
|
diff
|
raw
|
diff to current
2009-11-15
Documentation: clarify 'ours' merge strategy
blob
|
diff
|
raw
2009-10-27
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2009-09-21
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2009-09-16
Merge branch 'tf/diff-whitespace-incomplete-line' into...
blob
|
diff
|
raw
|
diff to current
2009-09-15
Merge branch 'jc/maint-1.6.0-blank-at-eof' into jc...
blob
|
diff
|
raw
|
diff to current
2009-09-15
Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part...
blob
|
diff
|
raw
|
diff to current
2009-09-15
Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part...
blob
|
diff
|
raw
|
diff to current
2009-09-15
Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part...
blob
|
diff
|
raw
|
diff to current
2009-09-03
Merge branch 'maint-1.6.2' into maint-1.6.3
blob
|
diff
|
raw
|
diff to current
2009-09-03
Merge branch 'maint-1.6.2' into maint-1.6.3
blob
|
diff
|
raw
|
diff to current
2009-09-01
Merge branch 'tf/diff-whitespace-incomplete-line'
blob
|
diff
|
raw
|
diff to current
2009-08-28
Merge branch 'maint-1.6.2' into maint-1.6.3
blob
|
diff
|
raw
|
diff to current
2009-08-21
Merge branch 'jc/maint-merge-recursive-fix' into maint
blob
|
diff
|
raw
|
diff to current
2009-08-16
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2009-08-11
Merge branch 'jc/maint-merge-recursive-fix'
blob
|
diff
|
raw
|
diff to current
next