Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
Fix git-apply with -p greater than 1
[gitweb.git]
/
builtin
/
merge-file.c
2010-09-18
Merge branch 'js/ls-files-x-doc'
blob
|
diff
|
raw
2010-09-15
Merge branch 'dr/maint-ls-tree-prefix-recursion-fix'
blob
|
diff
|
raw
2010-09-15
Merge branch 'os/fix-rebase-diff-no-prefix'
blob
|
diff
|
raw
2010-09-15
Merge branch 'ch/filter-branch-deprecate-remap-to-ancestor'
blob
|
diff
|
raw
2010-09-15
Merge branch 'ch/maint-cannot-create-bundle-error'
blob
|
diff
|
raw
2010-09-15
Merge branch 'ks/recursive-rename-add-identical'
blob
|
diff
|
raw
2010-09-15
Merge git://repo.or.cz/git-gui
blob
|
diff
|
raw
2010-09-12
Merge branch 'maint'
blob
|
diff
|
raw
2010-09-10
Merge branch 'maint'
blob
|
diff
|
raw
2010-09-10
Merge branch 'maint'
blob
|
diff
|
raw
2010-09-08
Merge branch 'jk/test-must-fail-missing'
blob
|
diff
|
raw
2010-09-08
Merge branch 'jh/error-removing-missing-note'
blob
|
diff
|
raw
2010-09-08
Merge branch 'kf/askpass-config'
blob
|
diff
|
raw
2010-09-08
Merge branch 'bc/maint-fetch-url-only'
blob
|
diff
|
raw
2010-09-08
Merge branch 'jk/maint-pass-c-config-in-env'
blob
|
diff
|
raw
2010-09-08
Merge branch 'en/d-f-conflict-fix'
blob
|
diff
|
raw
2010-09-07
Merge branch 'maint'
blob
|
diff
|
raw
2010-09-06
Merge branch 'jh/clean-exclude'
blob
|
diff
|
raw
2010-09-06
Merge branch 'jl/maint-fix-test'
blob
|
diff
|
raw
2010-09-06
Merge branch 'maint'
v1.7.3-rc0
blob
|
diff
|
raw
2010-09-06
Merge branch 'xx/trivial' into maint
blob
|
diff
|
raw
|
diff to current
2010-09-04
Merge branch 'jl/submodule-ignore-diff'
blob
|
diff
|
raw
2010-09-04
Merge branch 'ab/test-2'
blob
|
diff
|
raw
2010-09-04
Merge branch 'js/detached-stash'
blob
|
diff
|
raw
2010-09-04
Merge branch 'js/maint-reflog-beyond-horizon'
blob
|
diff
|
raw
2010-09-04
Merge branch 'dg/local-mod-error-messages'
blob
|
diff
|
raw
2010-09-04
Merge branch 'nd/maint-fix-replace'
blob
|
diff
|
raw
2010-09-03
Merge branch 'ab/compat-regex'
blob
|
diff
|
raw
2010-09-03
Merge branch 'nd/clone-depth-zero'
blob
|
diff
|
raw
2010-09-03
Merge branch 'jn/maint-doc-user-manual-html-doctype'
blob
|
diff
|
raw
2010-09-03
Merge branch 'cb/maint-mergetool-no-tty'
blob
|
diff
|
raw
2010-09-03
Merge branch 'jn/apply-filename-with-sp'
blob
|
diff
|
raw
2010-09-03
Merge branch 'jn/merge-custom-no-trivial'
blob
|
diff
|
raw
2010-09-03
Merge branch 'jc/maint-doc-em-dash'
blob
|
diff
|
raw
2010-09-03
Merge branch 'mg/doc-bundle'
blob
|
diff
|
raw
2010-09-03
Merge branch 'jn/doc-backslash'
blob
|
diff
|
raw
2010-09-03
Merge branch 'jn/update-contrib-example-merge'
blob
|
diff
|
raw
2010-09-03
Merge branch 'jn/merge-renormalize'
blob
|
diff
|
raw
2010-09-03
Sync with 1.7.2.3
blob
|
diff
|
raw
2010-09-01
Merge branch 'maint'
blob
|
diff
|
raw
2010-09-01
Merge branch 'en/rebase-against-rebase-fix' into maint
blob
|
diff
|
raw
|
diff to current
2010-08-31
Merge branch 'np/maint-huge-delta-generation'
blob
|
diff
|
raw
2010-08-31
Merge branch 'da/fix-submodule-sync-superproject-config'
blob
|
diff
|
raw
2010-08-31
Merge branch 'jn/cherry-revert-message-clean-up'
blob
|
diff
|
raw
2010-08-31
Merge branch 'cb/binary-patch-id'
blob
|
diff
|
raw
2010-08-31
Merge branch 'ab/maint-reset-mixed-w-pathspec-advice'
blob
|
diff
|
raw
2010-08-31
Merge branch 'dj/fetch-tagopt'
blob
|
diff
|
raw
2010-08-31
Merge branch 'en/d-f-conflict-fix'
blob
|
diff
|
raw
2010-08-31
Merge branch 'jn/svn-fe'
blob
|
diff
|
raw
2010-08-31
Merge branch 'tr/maint-no-unquote-plus'
blob
|
diff
|
raw
2010-08-31
Merge branch 'jn/paginate-fix'
blob
|
diff
|
raw
2010-08-22
Merge branch 'nd/fix-sparse-checkout'
blob
|
diff
|
raw
|
diff to current
2010-08-22
Merge branch 'en/rebase-against-rebase-fix'
blob
|
diff
|
raw
|
diff to current
2010-08-19
Merge branch 'tr/xsize-bits' into maint
blob
|
diff
|
raw
|
diff to current
2010-08-19
Merge branch 'jc/sha1-name-find-fix' into maint
blob
|
diff
|
raw
|
diff to current
2010-08-18
Merge branch 'sp/fix-smart-http-deadlock-on-error'...
blob
|
diff
|
raw
|
diff to current
2010-08-18
Merge branch 'tr/xsize-bits'
blob
|
diff
|
raw
|
diff to current
2010-08-16
merge-file: run setup_git_directory_gently() sooner
blob
|
diff
|
raw
2010-08-13
Merge branch 'jc/sha1-name-find-fix'
blob
|
diff
|
raw
|
diff to current
2010-08-13
Merge branch 'sp/fix-smart-http-deadlock-on-error'
blob
|
diff
|
raw
|
diff to current
2010-08-03
Merge branch 'sv/maint-diff-q-clear-fix' into maint
blob
|
diff
|
raw
|
diff to current
2010-08-02
Merge git://repo.or.cz/git-gui into pt/git-gui
blob
|
diff
|
raw
|
diff to current
2010-07-27
Sync with 1.7.0 series
blob
|
diff
|
raw
|
diff to current
2010-07-26
Merge branch 'maint-1.7.0' into maint-1.7.1
blob
|
diff
|
raw
|
diff to current
2010-07-16
Merge branch 'jc/diff-merge-base-multi'
blob
|
diff
|
raw
|
diff to current
2010-07-15
Merge branch 'jc/diff-merge-base-multi'
blob
|
diff
|
raw
|
diff to current
2010-07-15
Merge branch 'jn/grep-open'
blob
|
diff
|
raw
|
diff to current
2010-07-09
Merge remote branch 'ko/master' into jc/read-tree-cache...
blob
|
diff
|
raw
|
diff to current
2010-07-07
Merge branch 'maint-1.6.4' into maint
blob
|
diff
|
raw
|
diff to current
2010-07-07
Merge branch 'tr/receive-pack-aliased-update-fix' into...
blob
|
diff
|
raw
|
diff to current
2010-06-30
Merge branch 'cc/cherry-pick-stdin'
blob
|
diff
|
raw
|
diff to current
2010-06-30
Merge branch 'jl/status-ignore-submodules'
blob
|
diff
|
raw
|
diff to current
2010-06-30
Merge branch 'jk/url-decode'
blob
|
diff
|
raw
|
diff to current
2010-06-30
Merge branch 'jn/grep-open'
blob
|
diff
|
raw
|
diff to current
2010-06-30
Merge branch 'jp/string-list-api-cleanup'
blob
|
diff
|
raw
|
diff to current
2010-06-30
Merge branch 'tr/rev-list-count'
blob
|
diff
|
raw
|
diff to current
2010-06-30
Merge branch 'as/maint-completion-set-u-fix'
blob
|
diff
|
raw
|
diff to current
2010-06-30
Merge branch 'jl/maint-diff-ignore-submodules'
blob
|
diff
|
raw
|
diff to current
2010-06-28
Merge branch 'tr/send-email-8bit' into maint
blob
|
diff
|
raw
|
diff to current
2010-06-28
Merge branch 'pb/maint-perl-errmsg-no-dir' into maint
blob
|
diff
|
raw
|
diff to current
2010-06-28
Merge branch 'js/maint-am-rebase-invalid-author' into...
blob
|
diff
|
raw
|
diff to current
2010-06-28
Merge branch 'jc/maint-simpler-common-prefix' into...
blob
|
diff
|
raw
|
diff to current
2010-06-28
Merge branch 'bd/maint-unpack-trees-parawalk-fix' into...
blob
|
diff
|
raw
|
diff to current
2010-06-27
Merge branch 'cp/textconv-cat-file'
blob
|
diff
|
raw
|
diff to current
2010-06-27
Merge branch 'pb/maint-perl-errmsg-no-dir'
blob
|
diff
|
raw
|
diff to current
2010-06-27
Merge branch 'tr/send-email-8bit'
blob
|
diff
|
raw
|
diff to current
2010-06-27
Merge branch 'js/maint-am-rebase-invalid-author'
blob
|
diff
|
raw
|
diff to current
2010-06-27
Merge branch 'ab/blame-textconv'
blob
|
diff
|
raw
|
diff to current
2010-06-27
Merge branch 'jn/show-num-walks'
blob
|
diff
|
raw
|
diff to current
2010-06-23
Merge branch 'jk/url-decode'
blob
|
diff
|
raw
|
diff to current
2010-06-22
Merge branch 'jc/maint-simpler-common-prefix'
blob
|
diff
|
raw
|
diff to current
2010-06-22
Merge branch 'bd/maint-unpack-trees-parawalk-fix'
blob
|
diff
|
raw
|
diff to current
2010-06-22
Merge branch 'cc/cherry-pick-series'
blob
|
diff
|
raw
|
diff to current
2010-06-22
Merge branch 'jc/rev-list-ancestry-path'
blob
|
diff
|
raw
|
diff to current
2010-06-22
Merge branch 'ic/maint-rebase-i-abort' into maint
blob
|
diff
|
raw
|
diff to current
2010-06-22
Merge branch 'cc/maint-commit-reflog-msg' into maint
blob
|
diff
|
raw
|
diff to current
2010-06-22
Merge branch 'jk/maint-advice-empty-amend' into maint
blob
|
diff
|
raw
|
diff to current
2010-06-22
Merge branch 'tc/commit-abbrev-fix' into maint
blob
|
diff
|
raw
|
diff to current
2010-06-22
Merge branch 'jn/document-rebase-i-p-limitation' into...
blob
|
diff
|
raw
|
diff to current
2010-06-22
Merge branch 'jn/checkout-doc' into maint
blob
|
diff
|
raw
|
diff to current
next