Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
Merge branch 'rs/color-escape-has-zero-width'
[gitweb.git]
/
Documentation
/
merge-strategies.txt
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
2009-08-08
Merge branch 'maint-1.6.2' into maint-1.6.3
blob
|
diff
|
raw
|
diff to current
2009-07-29
Merge branch 'hv/cvsps-tests'
blob
|
diff
|
raw
|
diff to current
2009-07-02
Merge branch 'ne/maint-1.6.0-diff-tree-t-r-show-directory'
blob
|
diff
|
raw
|
diff to current
2009-06-22
Merge branch 'sb/maint-1.6.0-add-config-fix' into maint
blob
|
diff
|
raw
|
diff to current
2009-06-22
Merge branch 'pb/maint-1.6.2-userdiff-fix' into maint
blob
|
diff
|
raw
|
diff to current
2009-06-21
Merge branch 'maint-1.6.2' into maint
blob
|
diff
|
raw
|
diff to current
2009-06-21
Merge branch 'pb/maint-1.6.2-userdiff-fix'
blob
|
diff
|
raw
|
diff to current
2009-06-21
Merge branch 'sb/maint-1.6.0-add-config-fix'
blob
|
diff
|
raw
|
diff to current
2009-06-20
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2009-06-14
Merge branch 'maint-1.6.2' into maint
blob
|
diff
|
raw
|
diff to current
2009-06-11
Merge branch 'uk/maint-1.5.3-rebase-i-reflog' into...
blob
|
diff
|
raw
|
diff to current
2009-06-02
Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint
blob
|
diff
|
raw
|
diff to current
2009-06-02
Merge branch 'sb/maint-1.6.2-opt-filename-fix' into...
blob
|
diff
|
raw
|
diff to current
2009-05-29
Merge branch 'sb/maint-1.6.2-opt-filename-fix'
blob
|
diff
|
raw
|
diff to current
2009-05-26
Merge branch 'js/maint-no-ln-across-libexec-and-bin...
blob
|
diff
|
raw
|
diff to current
2009-05-26
Merge branch 'lt/maint-diff-reduce-lstat' into maint
blob
|
diff
|
raw
|
diff to current
2009-05-26
Merge branch 'do/maint-merge-recursive-fix' into maint
blob
|
diff
|
raw
|
diff to current
2009-05-26
Merge branch 'jk/maint-1.6.0-trace-argv' into maint
blob
|
diff
|
raw
|
diff to current
2009-05-25
Merge branch 'master' into sb/opt-filename
blob
|
diff
|
raw
|
diff to current
2009-05-24
Merge branch 'maint-1.6.2' into maint
blob
|
diff
|
raw
|
diff to current
2009-05-23
Merge branch 'mg/track'
blob
|
diff
|
raw
|
diff to current
2009-05-23
Merge branch 'js/maint-no-ln-across-libexec-and-bin'
blob
|
diff
|
raw
|
diff to current
2009-05-23
Merge branch 'lt/maint-diff-reduce-lstat'
blob
|
diff
|
raw
|
diff to current
2009-05-23
Merge branch 'do/maint-merge-recursive-fix'
blob
|
diff
|
raw
|
diff to current
2009-05-23
Merge branch 'jk/maint-1.6.0-trace-argv'
blob
|
diff
|
raw
|
diff to current
2009-05-16
Merge branch 'maint-1.6.2' into maint
blob
|
diff
|
raw
|
diff to current
2009-05-12
Merge branch 'maint-1.6.2' into maint
blob
|
diff
|
raw
|
diff to current
2009-05-06
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2009-05-03
Sync with GIT 1.6.2.5
blob
|
diff
|
raw
|
diff to current
2009-05-02
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
|
diff to current
2009-05-01
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2009-04-29
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2009-04-28
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2009-04-25
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2009-04-23
Merge branch 'jc/maint-read-tree-multi'
blob
|
diff
|
raw
|
diff to current
2009-04-21
Merge branch 'mk/maint-apply-swap'
blob
|
diff
|
raw
|
diff to current
2009-04-21
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2009-04-20
Merge branch 'mm/maint-add-p-quit'
blob
|
diff
|
raw
|
diff to current
2009-04-20
Sync with 1.6.2.4
blob
|
diff
|
raw
|
diff to current
2009-04-18
Merge branch 'lt/pack-object-memuse'
blob
|
diff
|
raw
|
diff to current
2009-04-18
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2009-04-18
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2009-04-13
Mark t1301 permission test to depend on POSIXPERM
blob
|
diff
|
raw
|
diff to current
2009-04-12
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2009-04-09
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2009-04-08
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2009-04-08
Merge branch 'bs/maint-1.6.0-tree-walk-prefix'
blob
|
diff
|
raw
|
diff to current
2009-04-08
Merge branch 'js/maint-submodule-checkout'
blob
|
diff
|
raw
|
diff to current
2009-04-08
Merge branch 'cb/maint-merge-recursive-submodule-fix'
blob
|
diff
|
raw
|
diff to current
2009-04-06
Merge branch 'jc/name-branch'
blob
|
diff
|
raw
|
diff to current
2009-04-06
Merge branch 'jc/shared-literally'
blob
|
diff
|
raw
|
diff to current
2009-04-06
Merge branch 'sb/format-patch-patchname'
blob
|
diff
|
raw
|
diff to current
2009-04-05
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2009-04-05
Merge branch 'cc/sha1-bsearch' into HEAD
blob
|
diff
|
raw
|
diff to current
2009-04-02
Sync with 1.6.2.2
blob
|
diff
|
raw
|
diff to current
2009-04-02
Merge branch 'ef/fast-export'
blob
|
diff
|
raw
|
diff to current
2009-04-02
Merge branch 'tr/maint-1.6.1-doc-format-patch--root'
blob
|
diff
|
raw
|
diff to current
2009-04-02
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2009-04-02
Merge branch 'jc/maint-1.6.0-keep-pack'
blob
|
diff
|
raw
|
diff to current
2009-04-02
Merge branch 'kb/tracking-count-no-merges'
blob
|
diff
|
raw
|
diff to current
2009-03-30
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
2009-03-30
Merge branch 'maint'
blob
|
diff
|
raw
|
diff to current
next