Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
Merge branch 'nd/diff-i-t-a'
[gitweb.git]
/
Documentation
/
merge-strategies.txt
2015-05-13
Merge branch 'ep/fix-test-lib-functions-report' into...
blob
|
diff
|
raw
2015-05-11
Merge branch 'sg/complete-decorate-full-not-long'
blob
|
diff
|
raw
2015-05-06
Merge branch 'ep/fix-test-lib-functions-report'
blob
|
diff
|
raw
2015-04-28
Merge branch 'mg/show-notes-doc'
blob
|
diff
|
raw
2015-04-21
Merge branch 'jz/gitweb-conf-doc-fix' into maint
blob
|
diff
|
raw
2015-04-21
Merge branch 'iu/fix-parse-options-h-comment' into...
blob
|
diff
|
raw
2015-04-19
Merge tag 'gitgui-0.20.0' of repo.or.cz/r/git-gui
blob
|
diff
|
raw
2015-04-14
Merge branch 'sb/plug-streaming-leak'
blob
|
diff
|
raw
2015-04-14
Merge branch 'jz/gitweb-conf-doc-fix'
blob
|
diff
|
raw
2015-04-14
Merge branch 'iu/fix-parse-options-h-comment'
blob
|
diff
|
raw
2015-03-24
Merge branch 'master' of git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
2015-03-23
Merge branch 'jc/decorate-leaky-separator-color' into...
blob
|
diff
|
raw
2015-03-20
Merge branch 'jc/decorate-leaky-separator-color'
blob
|
diff
|
raw
2015-03-14
Merge branch 'jc/diff-test-updates' into maint
blob
|
diff
|
raw
2015-03-14
Merge branch 'jc/apply-beyond-symlink' into maint
blob
|
diff
|
raw
2015-03-10
Merge branch 'jc/decorate-leaky-separator-color' into...
blob
|
diff
|
raw
2015-03-05
Merge branch 'sb/plug-leak-in-make-cache-entry' into...
blob
|
diff
|
raw
2015-03-05
Merge branch 'es/blame-commit-info-fix' into maint
blob
|
diff
|
raw
2015-03-05
Merge branch 'ab/merge-file-prefix' into maint
blob
|
diff
|
raw
2015-03-05
Merge branch 'ps/submodule-sanitize-path-upon-add'...
blob
|
diff
|
raw
2015-03-05
Merge branch 'jk/pack-bitmap' into maint
blob
|
diff
|
raw
2015-03-05
Merge branch 'jk/decimal-width-for-uintmax' into maint
blob
|
diff
|
raw
2015-03-05
Merge branch 'sb/hex-object-name-is-at-most-41-bytes...
blob
|
diff
|
raw
2015-03-05
Merge branch 'jc/diff-test-updates'
blob
|
diff
|
raw
2015-03-03
Merge branch 'jc/apply-beyond-symlink'
blob
|
diff
|
raw
2015-02-25
Merge branch 'sb/plug-leak-in-make-cache-entry'
blob
|
diff
|
raw
2015-02-25
Merge branch 'jc/send-email-sensible-encoding'
blob
|
diff
|
raw
2015-02-25
Merge branch 'sb/hex-object-name-is-at-most-41-bytes...
blob
|
diff
|
raw
2015-02-25
Merge branch 'jc/max-io-size-and-ssize-max'
blob
|
diff
|
raw
2015-02-25
Merge branch 'tc/missing-http-proxyauth'
blob
|
diff
|
raw
2015-02-25
Merge branch 'jc/diff-format-doc' into maint
blob
|
diff
|
raw
2015-02-25
Merge branch 'jk/remote-curl-an-array-in-struct-cannot...
blob
|
diff
|
raw
2015-02-25
Merge branch 'jk/status-read-branch-name-fix' into...
blob
|
diff
|
raw
2015-02-22
Merge branch 'ps/submodule-sanitize-path-upon-add'
blob
|
diff
|
raw
2015-02-22
Merge branch 'ab/merge-file-prefix'
blob
|
diff
|
raw
2015-02-22
Merge branch 'es/blame-commit-info-fix'
blob
|
diff
|
raw
2015-02-18
Merge branch 'jk/decimal-width-for-uintmax'
blob
|
diff
|
raw
2015-02-18
Merge branch 'jk/pack-bitmap'
blob
|
diff
|
raw
2015-02-17
Merge branch 'jk/status-read-branch-name-fix'
blob
|
diff
|
raw
2015-02-17
Merge branch 'jk/remote-curl-an-array-in-struct-cannot...
blob
|
diff
|
raw
2015-02-17
Merge branch 'jc/diff-format-doc'
blob
|
diff
|
raw
2015-01-12
Merge branch 'mh/find-uniq-abbrev' into maint
blob
|
diff
|
raw
2015-01-12
Merge branch 'rw/apply-does-not-take-ignore-date' into...
blob
|
diff
|
raw
2015-01-12
Merge branch 'jk/for-each-reflog-ent-reverse' into...
blob
|
diff
|
raw
2015-01-07
Merge branch 'maint-1.9' into maint-2.0
blob
|
diff
|
raw
2015-01-07
Merge branch 'maint-1.8.5' into maint-1.9
blob
|
diff
|
raw
|
diff to current
2015-01-07
Merge branch 'sb/t5400-remove-unused'
blob
|
diff
|
raw
2015-01-07
Merge branch 'pd/completion-filenames-fix'
blob
|
diff
|
raw
2015-01-07
Merge branch 'jc/diff-b-m'
blob
|
diff
|
raw
2014-12-22
Merge branch 'rw/apply-does-not-take-ignore-date'
blob
|
diff
|
raw
2014-12-22
Merge branch 'js/test-hashmap-squelch-gcc'
blob
|
diff
|
raw
2014-12-22
Merge branch 'po/doc-assume-unchanged'
blob
|
diff
|
raw
2014-12-22
Merge branch 'jk/for-each-reflog-ent-reverse'
blob
|
diff
|
raw
2014-12-22
Merge branch 'sv/doc-stripspace'
blob
|
diff
|
raw
2014-12-22
Merge branch 'rj/t0050-passes'
blob
|
diff
|
raw
2014-12-22
Merge branch 'mh/find-uniq-abbrev'
blob
|
diff
|
raw
2014-12-22
Merge branch 'jc/refer-to-t-readme-from-submitting...
blob
|
diff
|
raw
2014-12-22
Merge branch 'jk/checkout-from-tree' into maint
blob
|
diff
|
raw
2014-12-17
Sync with v1.9.5
blob
|
diff
|
raw
2014-12-17
Sync with v1.8.5.6
blob
|
diff
|
raw
|
diff to current
2014-12-12
Merge branch 'jk/pack-bitmap'
blob
|
diff
|
raw
2014-12-12
Merge branch 'rt/push-recurse-submodule-usage-string'
blob
|
diff
|
raw
2014-12-12
Merge branch 'sv/typofix-apply-error-message'
blob
|
diff
|
raw
2014-12-12
Merge branch 'jc/unpack-trees-plug-leak'
blob
|
diff
|
raw
2014-12-05
Merge branch 'jk/checkout-from-tree'
blob
|
diff
|
raw
2014-11-19
Merge branch 'sv/submitting-final-patch'
blob
|
diff
|
raw
2014-11-18
Merge branch 'jc/doc-commit-only'
blob
|
diff
|
raw
2014-11-12
Merge branch 'nd/gitignore-trailing-whitespace' into...
blob
|
diff
|
raw
2014-11-11
Merge branch 'rs/clean-menu-item-defn' into maint
blob
|
diff
|
raw
2014-11-10
Merge branch 'js/diff-highlight-avoid-sigpipe'
blob
|
diff
|
raw
2014-11-10
Merge branch 'jc/conflict-hint' into cc/interpret-trail...
blob
|
diff
|
raw
2014-11-06
Merge branch 'nd/gitignore-trailing-whitespace'
blob
|
diff
|
raw
2014-11-06
Merge branch 'tm/line-log-first-parent'
blob
|
diff
|
raw
2014-10-31
Merge branch 'rs/grep-color-words'
blob
|
diff
|
raw
2014-10-30
Merge git://ozlabs.org/~paulus/gitk
blob
|
diff
|
raw
2014-10-29
Merge branch 'bc/asciidoc-pretty-formats-fix' into...
blob
|
diff
|
raw
2014-10-29
Merge branch 'rs/daemon-fixes' into maint
blob
|
diff
|
raw
2014-10-29
Merge branch 'mg/lib-gpg-ro-safety'
blob
|
diff
|
raw
2014-10-16
Merge branch 'jc/completion-no-chdir'
blob
|
diff
|
raw
2014-10-14
Merge branch 'bc/asciidoc-pretty-formats-fix'
blob
|
diff
|
raw
2014-10-14
Merge branch 'rs/mailsplit'
blob
|
diff
|
raw
2014-10-14
Merge branch 'rs/sha1-array-test'
blob
|
diff
|
raw
2014-10-14
Merge branch 'rs/daemon-fixes'
blob
|
diff
|
raw
2014-10-14
Merge branch 'so/rebase-doc-fork-point'
blob
|
diff
|
raw
2014-10-08
Merge branch 'nd/archive-pathspec'
blob
|
diff
|
raw
2014-10-07
Merge branch 'maint-1.9' into maint-2.0
blob
|
diff
|
raw
2014-10-07
Merge branch 'maint-1.8.5' into maint-1.9
blob
|
diff
|
raw
|
diff to current
2014-09-30
Merge branch 'jc/test-lazy-prereq'
blob
|
diff
|
raw
2014-09-30
Merge branch 'sb/merge-recursive-copy-paste-fix'
blob
|
diff
|
raw
2014-09-30
Merge branch 'jk/fsck-exit-code-fix' into maint
blob
|
diff
|
raw
2014-09-30
Merge branch 'jk/index-pack-threading-races' into maint
blob
|
diff
|
raw
2014-09-29
Merge branch 'sb/t6031-typofix'
blob
|
diff
|
raw
2014-09-29
Merge branch 'sb/t9300-typofix'
blob
|
diff
|
raw
2014-09-26
Merge branch 'sb/help-unknown-command-sort-fix'
blob
|
diff
|
raw
2014-09-19
Merge branch 'et/spell-poll-infinite-with-minus-one...
blob
|
diff
|
raw
2014-09-19
Merge branch 'jn/unpack-trees-checkout-m-carry-deletion...
blob
|
diff
|
raw
2014-09-19
Merge branch 'sp/pack-protocol-doc-on-shallow' into...
blob
|
diff
|
raw
2014-09-19
Merge branch 'rs/refresh-beyond-symlink' into maint
blob
|
diff
|
raw
2014-09-19
Merge branch 'lf/bundle-exclusion' into maint
blob
|
diff
|
raw
2014-09-19
Merge branch 'jc/apply-ws-prefix' into maint
blob
|
diff
|
raw
next