Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
merge-recursive: Save D/F conflict filenames instead of unlinking them
[gitweb.git]
/
Documentation
/
howto
/
using-merge-subtree.txt
2011-06-01
Merge branch 'jk/maint-config-alias-fix' into maint
blob
|
diff
|
raw
2011-05-26
Merge branch 'jk/git-connection-deadlock-fix' into...
blob
|
diff
|
raw
2011-05-26
Merge branch 'js/maint-send-pack-stateless-rpc-deadlock...
blob
|
diff
|
raw
2011-05-26
Merge branch 'jm/maint-diff-words-with-sbe' into maint
blob
|
diff
|
raw
2011-05-26
Merge branch 'rg/copy-gecos-username' into maint
blob
|
diff
|
raw
2011-05-26
Merge branch 'jk/git-connection-deadlock-fix' into...
blob
|
diff
|
raw
2011-05-26
Merge branch 'js/maint-send-pack-stateless-rpc-deadlock...
blob
|
diff
|
raw
2011-05-16
Merge branch 'jc/fix-add-u-unmerged' into maint
blob
|
diff
|
raw
2011-05-16
Merge branch 'jc/maint-branch-mergeoptions' into maint
blob
|
diff
|
raw
2011-05-13
Merge branch 'gr/cvsimport-alternative-cvspass-location...
blob
|
diff
|
raw
2011-05-13
Merge branch 'jk/merge-one-file-working-tree' into...
blob
|
diff
|
raw
2011-05-13
Merge branch 'jc/fix-diff-files-unmerged' into maint
blob
|
diff
|
raw
2011-05-13
Merge branch 'mz/maint-rename-unmerged' into maint
blob
|
diff
|
raw
2011-05-11
Merge branch 'jc/maint-1.7.4-pathspec-stdin-and-cmdline'
blob
|
diff
|
raw
2011-05-04
Merge branch 'sp/maint-clear-postfields' into maint
blob
|
diff
|
raw
2011-05-04
Merge branch 'jk/maint-stash-oob' into maint
blob
|
diff
|
raw
2011-05-04
Merge branch 'jc/pack-objects-bigfile' into maint
blob
|
diff
|
raw
2011-04-29
Merge branch 'mg/x-years-12-months' into maint
blob
|
diff
|
raw
2011-04-13
Merge branch 'js/checkout-untracked-symlink' into maint
blob
|
diff
|
raw
2011-04-12
Merge branch 'js/checkout-untracked-symlink'
blob
|
diff
|
raw
2011-04-11
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
2011-04-03
Merge branch 'jc/index-update-if-able' into maint
blob
|
diff
|
raw
2011-04-03
Merge branch 'lt/default-abbrev' into maint
blob
|
diff
|
raw
2011-04-03
Merge branch 'jc/maint-rev-list-culled-boundary' into...
blob
|
diff
|
raw
2011-04-03
Merge branch 'jk/format-patch-multiline-header' into...
blob
|
diff
|
raw
2011-04-03
Merge branch 'lp/config-vername-check' into maint
blob
|
diff
|
raw
2011-04-02
Merge branch 'jc/merge-sans-branch'
blob
|
diff
|
raw
2011-04-01
Merge branch 'nd/index-doc' into maint
blob
|
diff
|
raw
2011-04-01
Merge branch 'jc/maint-diff-q-filter' into maint
blob
|
diff
|
raw
2011-04-01
Merge branch 'mg/doc-bisect-tweak-worktree' into maint
blob
|
diff
|
raw
2011-04-01
Merge branch 'jh/maint-do-not-track-non-branches' into...
blob
|
diff
|
raw
2011-04-01
Merge branch 'js/checkout-untracked-symlink' into maint
blob
|
diff
|
raw
2011-04-01
Merge "checkout ambiguous ref bugfix" into maint
blob
|
diff
|
raw
2011-03-29
Merge branch 'jc/fetch-progressive-stride'
blob
|
diff
|
raw
2011-03-29
Merge branches 'sp/maint-fetch-pack-stop-early' and...
blob
|
diff
|
raw
2011-03-27
Merge branch 'mg/rev-list-n-parents'
blob
|
diff
|
raw
2011-03-27
Merge branch 'jc/index-update-if-able'
blob
|
diff
|
raw
2011-03-27
Merge branch 'jc/maint-rerere-in-workdir'
blob
|
diff
|
raw
2011-03-27
Merge branch 'nd/index-doc'
blob
|
diff
|
raw
2011-03-27
Merge branch 'jc/fetch-progressive-stride'
blob
|
diff
|
raw
2011-03-26
Merge git-gui 0.14.0
blob
|
diff
|
raw
2011-03-23
Merge branch 'lt/default-abbrev'
blob
|
diff
|
raw
2011-03-23
Merge branch 'jc/maint-diff-q-filter'
blob
|
diff
|
raw
2011-03-23
Merge branch 'pw/p4'
blob
|
diff
|
raw
2011-03-23
Merge branch 'mg/rev-list-one-side-only'
blob
|
diff
|
raw
2011-03-23
Merge branch 'mg/doc-bisect-tweak-worktree'
blob
|
diff
|
raw
2011-03-23
Merge branch 'sp/maint-upload-pack-stop-early'
blob
|
diff
|
raw
2011-03-23
Merge branch 'sp/maint-fetch-pack-stop-early'
blob
|
diff
|
raw
2011-03-23
Merge branch 'jc/maint-rev-list-culled-boundary'
blob
|
diff
|
raw
2011-03-21
Merge branch 'mr/hpux' into maint
blob
|
diff
|
raw
2011-03-21
Merge branch 'so/submodule-no-update-first-time' into...
blob
|
diff
|
raw
2011-03-21
Merge branch 'ae/better-template-failure-report' into...
blob
|
diff
|
raw
2011-03-20
Merge branch 'uk/ls-remote-in-get-remote-url'
blob
|
diff
|
raw
2011-03-20
Merge branch 'jk/format-patch-multiline-header'
blob
|
diff
|
raw
2011-03-20
Merge branch 'jk/merge-rename-ux'
blob
|
diff
|
raw
2011-03-16
Merge branch 'jn/maint-commit-missing-template' into...
blob
|
diff
|
raw
2011-03-16
Merge branch 'lt/rename-no-extra-copy-detection' into...
blob
|
diff
|
raw
2011-03-16
Merge branch 'jk/diffstat-binary' into maint
blob
|
diff
|
raw
2011-03-16
Merge branch 'mg/maint-difftool-vim-readonly' into...
blob
|
diff
|
raw
2011-03-16
Merge branch 'jn/test-terminal-punt-on-osx-breakage...
blob
|
diff
|
raw
2011-03-16
Merge branch 'jk/fail-null-clone' into maint
blob
|
diff
|
raw
2011-03-16
Merge branch 'jh/push-default-upstream-configname'...
blob
|
diff
|
raw
2011-03-16
Merge branch 'mg/patch-id' into maint
blob
|
diff
|
raw
2011-03-16
Merge branch 'js/maint-merge-use-prepare-commit-msg...
blob
|
diff
|
raw
2011-03-16
Merge branch 'nd/struct-pathspec'
blob
|
diff
|
raw
2011-03-15
Merge branch 'jc/checkout-orphan-warning'
blob
|
diff
|
raw
2011-03-15
Merge branch 'jh/maint-do-not-track-non-branches'
blob
|
diff
|
raw
2011-03-15
Merge branch 'mr/hpux'
blob
|
diff
|
raw
2011-03-14
Merge branch 'sp/maint-smart-http-sans-100-continue'
blob
|
diff
|
raw
2011-03-13
Merge branch 'pw/p4'
blob
|
diff
|
raw
2011-03-09
Merge branch 'js/cherry-pick-usability'
blob
|
diff
|
raw
2011-03-09
Merge branch 'js/checkout-untracked-symlink'
blob
|
diff
|
raw
2011-03-09
Merge branch 'so/submodule-no-update-first-time'
blob
|
diff
|
raw
2011-03-04
Merge branch 'mg/maint-difftool-vim-readonly'
blob
|
diff
|
raw
2011-03-04
Merge branch 'jn/maint-commit-missing-template'
blob
|
diff
|
raw
2011-03-04
Merge branch 'jk/diffstat-binary'
blob
|
diff
|
raw
2011-03-04
Merge branch 'lt/rename-no-extra-copy-detection'
blob
|
diff
|
raw
2011-03-04
Merge branch 'jn/test-terminal-punt-on-osx-breakage'
blob
|
diff
|
raw
2011-03-04
Merge branch 'jk/fail-null-clone'
blob
|
diff
|
raw
2011-03-04
Merge branch 'jc/grep--no-index-pathspec-fix'
blob
|
diff
|
raw
2011-02-28
Merge branch 'jh/push-default-upstream-configname'
blob
|
diff
|
raw
2011-02-28
Merge branch 'lp/config-vername-check'
blob
|
diff
|
raw
2011-02-28
Merge branch 'mg/patch-id'
blob
|
diff
|
raw
2011-02-28
Merge branch 'mz/rerere-remaining'
blob
|
diff
|
raw
2011-02-28
Merge branch 'js/maint-merge-use-prepare-commit-msg...
blob
|
diff
|
raw
2011-02-28
Merge branch 'nd/hash-object-sanity'
blob
|
diff
|
raw
2011-02-28
Merge branch 'va/p4'
blob
|
diff
|
raw
2011-02-28
Merge branch 'pw/p4'
blob
|
diff
|
raw
2011-02-28
Merge branch 'uk/checkout-ambiguous-ref'
blob
|
diff
|
raw
2011-02-28
Merge branch 'sp/maint-smart-http-sans-100-continue'
blob
|
diff
|
raw
2011-02-28
Merge branch 'hv/mingw-fs-funnies'
blob
|
diff
|
raw
2011-02-28
Merge branch 'en/object-list-with-pathspec'
blob
|
diff
|
raw
2011-02-28
Merge branch 'nd/struct-pathspec'
blob
|
diff
|
raw
2011-02-26
Merge commit 'jn/svn-fe' of git://github.com/gitster...
blob
|
diff
|
raw
2011-02-16
Merge branch 'maint-1.7.3' into maint
blob
|
diff
|
raw
2011-02-11
Merge branch 'jc/fsck-fixes' into maint
blob
|
diff
|
raw
2011-02-10
Merge branch 'tr/merge-unborn-clobber'
blob
|
diff
|
raw
2011-02-10
Merge branch 'jc/unpack-trees'
blob
|
diff
|
raw
2011-02-10
Merge branch 'jc/fsck-fixes'
blob
|
diff
|
raw
2011-02-10
Merge branch 'tr/diff-words-test'
blob
|
diff
|
raw
next