Andrew's git
/
gitweb.git
/ history
summary
|
log
|
commit
|
diff
|
tree
first ⋅ prev ⋅
next
commit
grep
author
committer
pickaxe
?
re
merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
[gitweb.git]
/
t
/
t9350-fast-export.sh
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 '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
|
diff to current
2010-08-31
Merge branch 'tr/maint-no-unquote-plus'
blob
|
diff
|
raw
|
diff to current
2010-08-31
Merge branch 'jn/paginate-fix'
blob
|
diff
|
raw
|
diff to current
2010-08-31
Merge branch 'jn/maint-setup-fix'
blob
|
diff
|
raw
|
diff to current
2010-08-31
Merge branch 'en/fast-export-fix'
blob
|
diff
|
raw
|
diff to current
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-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-13
Mark tests that use symlinks as needing SYMLINKS prereq...
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-02
Merge git://repo.or.cz/git-gui into pt/git-gui
blob
|
diff
|
raw
|
diff to current
2010-07-26
Merge branch 'maint-1.6.6' into maint-1.7.0
blob
|
diff
|
raw
|
diff to current
2010-07-19
fast-export: Add a --full-tree option
blob
|
diff
|
raw
|
diff to current
2010-07-19
fast-export: Fix dropping of files with --import-marks...
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-09
fast-export: Fix output order of D/F changes
blob
|
diff
|
raw
|
diff to current
2010-07-09
Add additional testcases for D/F conflicts
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-06-22
Merge branch 'pc/remove-warn' into maint
blob
|
diff
|
raw
|
diff to current
2010-06-21
Merge branch 'eb/core-eol'
blob
|
diff
|
raw
|
diff to current
2010-06-21
Merge branch 'fg/autocrlf'
blob
|
diff
|
raw
|
diff to current
2010-06-21
Merge branch 'js/async-thread'
blob
|
diff
|
raw
|
diff to current
2010-06-21
Merge branch 'bg/apply-blank-trailing-context' into...
blob
|
diff
|
raw
|
diff to current
2010-06-16
Merge branch 'np/index-pack-memsave' into maint
blob
|
diff
|
raw
|
diff to current
2010-06-16
Merge branch 'jc/am-3-show-corrupted-patch' into maint
blob
|
diff
|
raw
|
diff to current
2010-06-16
Merge branch 'sp/maint-describe-tiebreak-with-tagger...
blob
|
diff
|
raw
|
diff to current
2010-06-16
Merge branch 'np/malloc-threading' into maint
blob
|
diff
|
raw
|
diff to current
2010-06-16
Merge branch 'bg/send-email-smtpdomain' into maint
blob
|
diff
|
raw
|
diff to current
2010-06-16
Merge branch 'rc/maint-curl-helper' into maint
blob
|
diff
|
raw
|
diff to current
2010-06-16
Merge branch 'hg/maint-attr-fix' into maint
blob
|
diff
|
raw
|
diff to current
2010-06-13
Merge branch 'js/try-to-free-stackable'
blob
|
diff
|
raw
|
diff to current
2010-05-21
Merge branch 'jn/gitweb-our-squelch'
blob
|
diff
|
raw
|
diff to current
2010-05-21
Merge branch 'np/index-pack-memsave'
blob
|
diff
|
raw
|
diff to current
2010-05-21
Merge branch 'jc/am-3-show-corrupted-patch'
blob
|
diff
|
raw
|
diff to current
2010-05-21
Merge branch 'jc/maint-no-reflog-expire-unreach-for...
blob
|
diff
|
raw
|
diff to current
2010-05-21
Merge branch 'sp/maint-describe-tiebreak-with-tagger...
blob
|
diff
|
raw
|
diff to current
2010-05-21
Merge branch 'np/malloc-threading'
blob
|
diff
|
raw
|
diff to current
2010-05-21
Merge branch 'ld/discovery-limit-to-fs' (early part)
blob
|
diff
|
raw
|
diff to current
2010-05-21
Merge branch 'ar/config-from-command-line'
blob
|
diff
|
raw
|
diff to current
2010-05-21
Merge branch 'em/checkout-orphan'
blob
|
diff
|
raw
|
diff to current
2010-05-09
Merge branch 'bg/apply-blank-trailing-context'
blob
|
diff
|
raw
|
diff to current
2010-05-09
Merge branch 'bg/send-email-smtpdomain'
blob
|
diff
|
raw
|
diff to current
2010-05-09
Merge branch 'rc/maint-curl-helper'
blob
|
diff
|
raw
|
diff to current
2010-05-09
Merge branch 'hg/maint-attr-fix'
blob
|
diff
|
raw
|
diff to current
2010-05-09
Merge branch 'jc/maint-reflog-expire-unreachable'
blob
|
diff
|
raw
|
diff to current
2010-05-09
Merge branch 'sd/log-decorate'
blob
|
diff
|
raw
|
diff to current
2010-05-09
Merge branch 'cc/revert-strategy'
blob
|
diff
|
raw
|
diff to current
2010-05-09
Merge branch 'pc/remove-warn'
blob
|
diff
|
raw
|
diff to current
2010-04-23
Merge branch 'mg/use-default-abbrev-length-in-rev-list...
blob
|
diff
|
raw
|
diff to current
2010-04-23
Merge branch 'jk/maint-diffstat-overflow' into maint
blob
|
diff
|
raw
|
diff to current
2010-04-23
Merge branch 'da/maint-python-startup' into maint
blob
|
diff
|
raw
|
diff to current
2010-04-19
Merge branch 'maint-1.6.6' into maint
blob
|
diff
|
raw
|
diff to current
2010-04-19
Merge branch 'jk/maint-diffstat-overflow'
blob
|
diff
|
raw
|
diff to current
2010-04-19
Merge git://git.kernel.org/pub/scm/gitk/gitk
blob
|
diff
|
raw
|
diff to current
2010-04-11
Merge branch 'jl/maint-submodule-gitfile-awareness'
blob
|
diff
|
raw
|
diff to current
2010-04-11
Merge branch 'rc/maint-reflog-msg-for-forced-branch...
blob
|
diff
|
raw
|
diff to current
2010-04-10
Merge branch 'jl/maint-submodule-gitfile-awareness'
blob
|
diff
|
raw
|
diff to current
2010-04-10
Merge branch 'ef/maint-empty-commit-log' into maint
blob
|
diff
|
raw
|
diff to current
2010-04-10
Merge branch 'jc/conflict-marker-size' into maint
blob
|
diff
|
raw
|
diff to current
next