Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
Merge branch 'fk/maint-cvsimport-early-failure' into maint
[gitweb.git]
/
Documentation
/
merge-strategies.txt
2011-04-01
Merge "checkout ambiguous ref bugfix" into maint
blob
|
diff
|
raw
2011-03-16
Merge branch 'jn/maint-commit-missing-template' into...
blob
|
diff
|
raw
2011-03-16
Merge branch 'jk/diffstat-binary' into maint
blob
|
diff
|
raw
2011-03-16
Merge branch 'jn/test-terminal-punt-on-osx-breakage...
blob
|
diff
|
raw
2011-02-16
Merge branch 'maint-1.7.3' into maint
blob
|
diff
|
raw
2011-02-16
Merge branch 'maint-1.7.2' into maint-1.7.3
blob
|
diff
|
raw
|
diff to current
2011-02-10
Merge branch 'maint-1.7.0' into maint
blob
|
diff
|
raw
2011-01-31
Merge branch 'jl/fetch-submodule-recursive' into maint
blob
|
diff
|
raw
2011-01-27
Merge branch 'maint'
blob
|
diff
|
raw
2011-01-27
Merge branch 'jn/fast-import-empty-tree-removal' into...
blob
|
diff
|
raw
|
diff to current
2011-01-19
Merge branch 'maint'
blob
|
diff
|
raw
2011-01-19
Merge branch 'jk/diff-driver-binary-doc' into maint
blob
|
diff
|
raw
|
diff to current
2011-01-19
Merge branch 'tr/submodule-relative-scp-url' into maint
blob
|
diff
|
raw
|
diff to current
2011-01-19
Merge branch 'jn/maint-fast-import-object-reuse' into...
blob
|
diff
|
raw
|
diff to current
2011-01-19
Merge branch 'jn/submodule-b-current' into maint
blob
|
diff
|
raw
|
diff to current
2011-01-19
Merge branch 'jc/maint-svn-info-test-fix' into maint
blob
|
diff
|
raw
|
diff to current
2011-01-19
Merge branch 'nd/maint-relative' into maint
blob
|
diff
|
raw
|
diff to current
2011-01-13
Merge branch 'jn/gitweb-no-logo'
blob
|
diff
|
raw
2011-01-13
Merge branch 'jk/diff-driver-binary-doc'
blob
|
diff
|
raw
2011-01-13
Merge branch 'tr/submodule-relative-scp-url'
blob
|
diff
|
raw
2011-01-13
Merge branch 'maint'
blob
|
diff
|
raw
2011-01-10
Merge branch 'maint'
blob
|
diff
|
raw
2011-01-10
Merge branch 'maint-1.7.2' into maint
blob
|
diff
|
raw
|
diff to current
2011-01-09
Merge branch 'maint'
blob
|
diff
|
raw
2011-01-05
Merge branch 'maint' to sync with 1.7.3.5
blob
|
diff
|
raw
2011-01-05
Merge branch 'mg/cvsimport'
blob
|
diff
|
raw
2011-01-04
Merge branch 'maint'
blob
|
diff
|
raw
2010-12-28
Merge branch 'maint'
blob
|
diff
|
raw
2010-12-28
Merge branch 'jc/maint-rebase-rewrite-last-skip'
blob
|
diff
|
raw
2010-12-26
Merge branch 'rs/maint-diff-fd-leak' into maint
blob
|
diff
|
raw
|
diff to current
2010-12-23
Merge branch 'rj/maint-difftool-cygwin-workaround'
blob
|
diff
|
raw
2010-12-23
Merge branch 'maint'
blob
|
diff
|
raw
2010-12-22
Merge branch 'rj/maint-test-fixes'
blob
|
diff
|
raw
2010-12-22
Merge branch 'jc/maint-am-abort-safely'
blob
|
diff
|
raw
2010-12-22
Merge branch 'jk/commit-die-on-bogus-ident'
blob
|
diff
|
raw
2010-12-22
Merge branch 'nd/maint-fix-add-typo-detection'
blob
|
diff
|
raw
2010-12-21
Merge branch 'maint'
blob
|
diff
|
raw
2010-12-21
Merge branch 'ks/blame-worktree-textconv-cached'
blob
|
diff
|
raw
2010-12-21
Merge branch 'jk/maint-decorate-01-bool'
blob
|
diff
|
raw
2010-12-21
Merge branch 'jn/maint-gitweb-pathinfo-fix'
blob
|
diff
|
raw
2010-12-20
Merge branch 'maint'
blob
|
diff
|
raw
2010-12-17
Merge branch 'maint'
blob
|
diff
|
raw
2010-12-16
Merge branch 'jl/fetch-submodule-recursive'
blob
|
diff
|
raw
2010-12-16
Merge branch 'nd/extended-sha1-relpath'
blob
|
diff
|
raw
2010-12-16
Merge branch 'ak/describe-exact'
blob
|
diff
|
raw
2010-12-16
Merge branch 'nd/maint-relative'
blob
|
diff
|
raw
2010-12-16
Merge branch 'jn/maint-svn-fe'
blob
|
diff
|
raw
2010-12-16
Merge branch 'jc/maint-svn-info-test-fix'
blob
|
diff
|
raw
2010-12-16
Merge branch 'jn/submodule-b-current'
blob
|
diff
|
raw
2010-12-16
Merge branch 'jn/maint-fast-import-object-reuse'
blob
|
diff
|
raw
2010-12-16
Sync with 1.7.3.4
blob
|
diff
|
raw
2010-12-15
Git 1.7.3.4
v1.7.3.4
blob
|
diff
|
raw
|
diff to current
2010-12-15
Git 1.7.0.9
v1.7.0.9
blob
|
diff
|
raw
|
diff to current
2010-12-15
Git 1.6.6.3
v1.6.6.3
blob
|
diff
|
raw
|
diff to current
2010-12-15
Merge branch 'master' (early part) into pd/bash-4-compl...
blob
|
diff
|
raw
2010-12-14
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
2010-12-14
Merge branch 'maint'
blob
|
diff
|
raw
2010-12-14
Merge branch 'jk/maint-reflog-bottom' into maint
blob
|
diff
|
raw
|
diff to current
2010-12-14
Merge branch 'mz/maint-rebase-stat-config' into maint
blob
|
diff
|
raw
|
diff to current
2010-12-13
Merge branch 'jn/parse-options-extra'
blob
|
diff
|
raw
2010-12-13
Merge branch 'ja/maint-pull-rebase-doc'
blob
|
diff
|
raw
2010-12-13
Merge branch 'gb/web--browse'
blob
|
diff
|
raw
2010-12-13
Merge branch 'nd/maint-hide-checkout-index-from-error'
blob
|
diff
|
raw
2010-12-13
Merge branch 'tc/http-urls-ends-with-slash'
blob
|
diff
|
raw
2010-12-13
Merge branch 'mz/rebase-abort-reflog-fix'
blob
|
diff
|
raw
2010-12-13
Merge branch 'jk/maint-reflog-bottom'
blob
|
diff
|
raw
2010-12-13
Merge branch 'mz/maint-rebase-stat-config'
blob
|
diff
|
raw
2010-12-13
Merge branch 'jn/git-cmd-h-bypass-setup'
blob
|
diff
|
raw
2010-12-11
Merge branch 'maint'
blob
|
diff
|
raw
2010-12-09
Merge branch 'maint'
blob
|
diff
|
raw
2010-12-09
Merge branch 'np/diff-in-corrupt-repository' into maint
blob
|
diff
|
raw
|
diff to current
2010-12-09
Merge branch 'ak/apply-non-git-epoch' into maint
blob
|
diff
|
raw
|
diff to current
2010-12-09
Merge branch 'cm/diff-check-at-eol' into maint
blob
|
diff
|
raw
|
diff to current
2010-12-09
Merge branch 'tc/smart-http-post-redirect' into maint
blob
|
diff
|
raw
|
diff to current
2010-12-09
Merge branch 'ab/require-perl-5.8' into maint
blob
|
diff
|
raw
|
diff to current
2010-12-08
Merge branch 'nd/maint-fix-add-typo-detection' (early...
blob
|
diff
|
raw
2010-12-08
Merge branch 'il/remote-fd-ext'
blob
|
diff
|
raw
2010-12-08
Merge branch 'jk/pager-per-command'
blob
|
diff
|
raw
2010-12-08
Merge branch 'jk/maint-decorate-01-bool'
blob
|
diff
|
raw
2010-12-08
Merge branch 'gc/http-with-non-ascii-username-url'
blob
|
diff
|
raw
2010-12-08
Merge branch 'ks/maint-getenv-fix'
blob
|
diff
|
raw
2010-12-08
Merge branch 'mg/maint-tag-rfc1991'
blob
|
diff
|
raw
2010-12-08
Merge branch 'jh/notes-merge'
blob
|
diff
|
raw
2010-12-08
Merge branch 'jk/diff-CBM'
blob
|
diff
|
raw
2010-12-08
Merge branch 'maint'
blob
|
diff
|
raw
2010-12-04
Merge branch 'jn/ignore-doc'
blob
|
diff
|
raw
2010-12-04
Merge branch 'kb/maint-status-cquote'
blob
|
diff
|
raw
2010-12-04
Merge branch 'pn/commit-autosquash'
blob
|
diff
|
raw
2010-12-04
Merge branch 'sp/emfile'
blob
|
diff
|
raw
2010-12-04
Merge branch 'jj/icase-directory'
blob
|
diff
|
raw
2010-12-03
Merge branch 'maint' to sync with Git 1.7.3.3
blob
|
diff
|
raw
2010-12-02
Merge branch 'maint'
blob
|
diff
|
raw
2010-12-02
Prepare for 1.7.3.3
blob
|
diff
|
raw
|
diff to current
2010-12-02
Merge branch 'cb/maint-orphan-merge-noclobber' into...
blob
|
diff
|
raw
|
diff to current
2010-12-02
Merge branch 'jk/add-e-doc' into maint
blob
|
diff
|
raw
|
diff to current
2010-12-02
Merge branch 'bg/maint-gitweb-test-lib' into maint
blob
|
diff
|
raw
|
diff to current
2010-12-02
Merge branch 'tr/maint-merge-file-subdir' into maint
blob
|
diff
|
raw
|
diff to current
2010-12-02
Merge branch 'ks/no-textconv-symlink' into maint
blob
|
diff
|
raw
|
diff to current
2010-12-02
Merge branch 'bc/fortran-userdiff' into maint
blob
|
diff
|
raw
|
diff to current
2010-12-02
Merge branch 'maint'
blob
|
diff
|
raw
next