Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
upload-pack: simplify request validation
[gitweb.git]
/
Documentation
/
merge-strategies.txt
2013-01-18
Merge branch 'nd/attr-debug-fix'
blob
|
diff
|
raw
2013-01-18
Merge branch 'ds/completion-silence-in-tree-path-probe'
blob
|
diff
|
raw
2013-01-14
Merge branch 'jc/blame-no-follow'
blob
|
diff
|
raw
2013-01-14
Merge branch 'jk/maint-fast-import-doc-reorder' into...
blob
|
diff
|
raw
2013-01-14
Merge branch 'jk/shortlog-no-wrap-doc' into maint
blob
|
diff
|
raw
2013-01-14
Merge branch 'jk/maint-fast-import-doc-dedup-done'...
blob
|
diff
|
raw
2013-01-14
Merge branch 'rs/leave-base-name-in-name-field-of-tar...
blob
|
diff
|
raw
2013-01-14
Merge branch 'jl/interrupt-clone-remove-separate-git...
blob
|
diff
|
raw
2013-01-14
Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credi...
blob
|
diff
|
raw
2013-01-14
Merge branch 'jc/apply-trailing-blank-removal' into...
blob
|
diff
|
raw
2013-01-14
Merge branch 'mk/maint-graph-infinity-loop' into maint
blob
|
diff
|
raw
2013-01-12
Merge branch 'jk/maint-fast-import-doc-reorder'
blob
|
diff
|
raw
2013-01-12
Merge branch 'jk/shortlog-no-wrap-doc'
blob
|
diff
|
raw
2013-01-12
Merge branch 'as/api-allocation-doc' into maint
blob
|
diff
|
raw
2013-01-12
Merge branch 'os/gitweb-highlight-uncaptured' into...
blob
|
diff
|
raw
2013-01-12
Merge branch 'jn/warn-on-inaccessible-loosen' into...
blob
|
diff
|
raw
2013-01-10
Merge branch 'ta/remove-stale-translated-tut' into...
blob
|
diff
|
raw
2013-01-10
Merge branch 'tb/test-t9020-no-which' into maint
blob
|
diff
|
raw
2013-01-10
Merge branch 'sp/shortlog-missing-lf' into maint
blob
|
diff
|
raw
2013-01-10
Merge branch 'as/api-allocation-doc'
blob
|
diff
|
raw
2013-01-10
Merge branch 'rs/leave-base-name-in-name-field-of-tar'
blob
|
diff
|
raw
2013-01-10
Merge branch 'jl/interrupt-clone-remove-separate-git...
blob
|
diff
|
raw
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 'os/gitweb-highlight-uncaptured'
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-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-02
Merge branch 'sp/shortlog-missing-lf'
blob
|
diff
|
raw
2013-01-02
Merge branch 'mk/maint-graph-infinity-loop'
blob
|
diff
|
raw
2012-12-23
Merge branch 'nd/index-format-doc' into maint
blob
|
diff
|
raw
2012-12-21
Merge branch 'nd/index-format-doc'
blob
|
diff
|
raw
2012-12-11
Merge branch 'ef/mingw-rmdir'
blob
|
diff
|
raw
2012-11-29
Merge branch 'jl/submodule-rm'
blob
|
diff
|
raw
2012-11-26
Merge branch 'cn/config-missing-path' into maint
blob
|
diff
|
raw
2012-11-21
Merge branch 'jk/maint-http-half-auth-fetch'
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-http-half-auth-fetch'
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 'js/format-2047' into maint
blob
|
diff
|
raw
2012-11-19
Merge branch 'nd/grep-true-path' into maint
blob
|
diff
|
raw
2012-11-19
Merge branch 'da/mergetools-p4' into maint
blob
|
diff
|
raw
2012-11-19
Merge branch 'jc/test-say-color-avoid-echo-escape'...
blob
|
diff
|
raw
2012-11-19
Merge branch 'bw/config-lift-variable-name-length-limit...
blob
|
diff
|
raw
2012-11-15
Merge branch 'as/maint-doc-fix-no-post-rewrite'
blob
|
diff
|
raw
2012-11-15
Merge branch 'jc/maint-fetch-tighten-refname-check'
blob
|
diff
|
raw
2012-11-09
Merge branch 'nd/tree-walk-enum-cleanup'
blob
|
diff
|
raw
2012-11-09
Merge branch 'js/format-2047'
blob
|
diff
|
raw
2012-11-09
Merge branch 'rs/lock-correct-ref-during-delete'
blob
|
diff
|
raw
2012-11-09
Merge branch 'nd/attr-match-optim-more'
blob
|
diff
|
raw
2012-10-29
Merge branch 'nd/grep-true-path'
blob
|
diff
|
raw
2012-10-29
Merge branch 'jk/maint-http-init-not-in-result-handler'
blob
|
diff
|
raw
2012-10-29
Merge branch 'jl/submodule-rm'
blob
|
diff
|
raw
2012-10-25
Merge branch 'jk/strbuf-detach-always-non-null'
blob
|
diff
|
raw
2012-10-25
Merge branch 'js/mingw-fflush-errno'
blob
|
diff
|
raw
2012-10-25
Merge branch 'da/mergetools-p4'
blob
|
diff
|
raw
2012-10-25
Merge branch 'jc/test-say-color-avoid-echo-escape'
blob
|
diff
|
raw
2012-10-25
Merge branch 'nd/attr-match-optim'
blob
|
diff
|
raw
2012-10-25
Merge branch 'jk/peel-ref'
blob
|
diff
|
raw
2012-10-25
Merge branch 'bw/config-lift-variable-name-length-limit'
blob
|
diff
|
raw
2012-10-25
Merge branch 'fa/remote-svn'
blob
|
diff
|
raw
2012-10-25
Merge branch 'jk/no-more-pre-exec-callback'
blob
|
diff
|
raw
2012-10-17
Merge tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui
blob
|
diff
|
raw
2012-10-17
Merge branch 'jk/maint-http-half-auth-push' into maint
blob
|
diff
|
raw
2012-10-17
Merge branch 'rr/git-uri-doc' into maint
blob
|
diff
|
raw
2012-10-17
Merge branch 'bw/cp-a-is-gnuism' into maint
blob
|
diff
|
raw
2012-10-17
Merge branch 'nd/doc-ignore' into maint
blob
|
diff
|
raw
2012-10-17
Merge branch 'jc/doc-long-options' into maint
blob
|
diff
|
raw
2012-10-17
Merge branch 'jc/maint-t1450-fsck-order-fix' into maint
blob
|
diff
|
raw
2012-10-17
Merge branch 'rr/test-use-shell-path-not-shell' into...
blob
|
diff
|
raw
2012-10-17
Merge branch 'rr/test-make-sure-we-have-git' into maint
blob
|
diff
|
raw
2012-10-17
Merge branch 'po/maint-docs' into maint
blob
|
diff
|
raw
2012-10-17
Merge branch 'jc/ll-merge-binary-ours' into maint
blob
|
diff
|
raw
2012-10-16
Merge branch 'jk/maint-http-half-auth-push'
blob
|
diff
|
raw
2012-10-14
Merge branch 'maint'
blob
|
diff
|
raw
2012-10-12
Merge branch 'maint'
blob
|
diff
|
raw
2012-10-10
Merge branch 'rr/git-uri-doc'
blob
|
diff
|
raw
2012-10-10
Merge branch 'bw/cp-a-is-gnuism'
blob
|
diff
|
raw
2012-10-10
Merge branch 'nd/doc-ignore'
blob
|
diff
|
raw
2012-10-10
Merge branch 'jc/doc-long-options'
blob
|
diff
|
raw
2012-10-10
Sync with maint
blob
|
diff
|
raw
2012-10-09
Merge branch 'maint'
blob
|
diff
|
raw
2012-10-08
Merge branch 'jc/maint-t1450-fsck-order-fix'
blob
|
diff
|
raw
2012-10-08
Merge branch 'jc/merge-bases-paint-fix'
blob
|
diff
|
raw
2012-10-08
Sync with 1.7.12.3
blob
|
diff
|
raw
2012-10-08
Merge branch 'os/commit-submodule-ignore' into maint
blob
|
diff
|
raw
|
diff to current
2012-10-03
Merge branch 'lt/mailinfo-handle-attachment-more-sanely'
blob
|
diff
|
raw
2012-10-02
Merge branch 'maint'
blob
|
diff
|
raw
2012-10-01
Merge branch 'jk/completion-tests'
blob
|
diff
|
raw
2012-10-01
Merge branch 'ep/malloc-check-perturb'
blob
|
diff
|
raw
2012-10-01
Merge branch 'da/mergetool-custom'
blob
|
diff
|
raw
2012-10-01
Merge branch 'os/commit-submodule-ignore'
blob
|
diff
|
raw
2012-10-01
Merge branch 'jc/blame-follows-renames'
blob
|
diff
|
raw
2012-10-01
Merge branch 'jk/receive-pack-unpack-error-to-pusher'
blob
|
diff
|
raw
next