mergetool: Add prompt to continue after failing to merge a file
[gitweb.git] / t /
2008-11-14 Merge git://git.bogomips.org/git-svn
2008-11-14 Merge branch 'maint'
2008-11-13 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-11-13 Merge branch 'jn/gitweb-customlinks'
2008-11-13 Merge branch 'gb/gitweb-snapshot-pathinfo'
2008-11-13 Merge branch 'ds/uintmax-config' (early part)
2008-11-13 Merge branch 'jk/maint-commit-v-strip'
2008-11-13 Merge branch 'np/pack-safer'
2008-11-13 Merge branch 'mk/maint-cg-push'
2008-11-13 Merge branch 'bc/maint-keep-pack'
2008-11-13 Merge branch 'mv/remote-rename'
2008-11-13 Merge branch 'jk/deny-push-to-current'
2008-11-13 Merge branch 'dl/xdiff'
2008-11-13 Merge branch 'lt/decorate'
2008-11-13 Merge branch 'jk/diff-convfilter'
2008-11-13 Merge branch 'jk/diff-convfilter-test-fix'
2008-11-13 Merge branch 'st/tag'
2008-11-13 Merge git://repo.or.cz/git-gui
2008-11-13 t7700: test that 'repack -a' packs alternate packed...
2008-11-12 Merge branch 'maint'
2008-11-12 Fix pack.packSizeLimit and --max-pack-size handling
2008-11-12 commit: Fix stripping of patch in verbose mode.
2008-11-12 pack-objects: extend --local to mean ignore non-local...
2008-11-12 t7700: demonstrate mishandling of loose objects in...
2008-11-12 repack: don't repack local objects in packs with .keep...
2008-11-12 t7700: demonstrate mishandling of objects in packs...
2008-11-12 git-remote rename: migrate from remotes/ and branches/
2008-11-11 git push: Interpret $GIT_DIR/branches in a Cogito compa...
2008-11-11 Merge branch 'maint'
2008-11-09 t5303: fix printf format string for portability
2008-11-09 t5303: work around printf breakage in dash
2008-11-09 Merge branch 'maint'
2008-11-09 receive-pack: detect push to current branch of non...
2008-11-09 t5516: refactor oddball tests
2008-11-09 checkout: Don't crash when switching away from an inval...
2008-11-09 Merge branch 'maint'
2008-11-09 Merge branch 'cb/maint-update-ref-fix' into maint
2008-11-09 Merge branch 'cj/maint-gitpm-fix-maybe-self' into maint
2008-11-09 Merge branch 'ar/maint-mksnpath' into maint
2008-11-09 Merge branch 'mv/maint-branch-m-symref' into maint
2008-11-09 Merge branch 'ds/autoconf'
2008-11-09 Merge branch 'rs/blame'
2008-11-09 t5400: expect success for denying deletion
2008-11-06 git-svn: proper detection of bare repositories
2008-11-06 git-svn: respect i18n.commitencoding config
2008-11-05 push: fix local refs update if already up-to-date
2008-11-05 do not force write of packed refs
2008-11-05 Implement git remote rename
2008-11-05 Merge branch 'ar/mksnpath'
2008-11-05 Merge branch 'jc/gitweb-fix-cloud-tag'
2008-11-05 Merge branch 'mv/maint-branch-m-symref'
2008-11-05 Merge branch 'mv/parseopt-checkout-index'
2008-11-04 tag: Add more tests about mixing incompatible modes...
2008-11-04 Merge branch 'maint'
2008-11-03 Merge branch 'maint'
2008-11-03 Merge branch 'np/index-pack'
2008-11-03 Merge branch 'sh/rebase-i-p'
2008-11-03 Merge branch 'ag/blame-encoding'
2008-11-03 Merge branch 'gb/gitweb-pathinfo'
2008-11-03 Merge branch 'cj/maint-gitpm-fix-maybe-self'
2008-11-02 extend test coverage for latest pack corruption resilie...
2008-11-02 close another possibility for propagating pack corruption
2008-11-02 Merge branch 'js/maint-fetch-update-head' into maint
2008-11-02 Merge branch 'jk/maint-ls-files-other' into maint
2008-11-02 Merge branch 'jc/maint-reset-remove-unmerged-new' into...
2008-11-02 Merge branch 'jc/maint-co-track' into maint
2008-11-02 Introduce receive.denyDeletes
2008-11-02 Merge branch 'maint'
2008-11-02 Merge git://repo.or.cz/git-gui
2008-11-02 Merge branch 'maint' of git://repo.or.cz/git-gui into...
2008-11-01 update-ref --no-deref -d: handle the case when the...
2008-11-01 Avoid using non-portable `echo -n` in tests.
2008-10-31 Merge branch 'maint'
2008-10-31 Use test-chmtime -v instead of perl in t5000 to get...
2008-10-31 Merge branch 'ar/maint-mksnpath' into ar/mksnpath
2008-10-30 git branch -m: forbid renaming of a symref
2008-10-27 Merge branch 'ar/maint-mksnpath' into HEAD
2008-10-26 Merge branch 'maint'
2008-10-26 git-archive: work in bare repos
2008-10-26 Fix git update-ref --no-deref -d.
2008-10-26 Fix git branch -m for symrefs.
2008-10-26 enable textconv for diff in verbose status/commit
2008-10-26 add userdiff textconv tests
2008-10-26 wt-status: load diff ui config
2008-10-26 only textconv regular files
2008-10-26 userdiff: require explicitly allowing textconv
2008-10-26 refactor userdiff textconv code
2008-10-23 improve index-pack tests
2008-10-23 git-remote: list branches in vertical lists
2008-10-23 rm: loosen safety valve for empty files
2008-10-22 Merge branch 'jk/diff-convfilter'
2008-10-22 Merge branch 'js/maint-fetch-update-head'
2008-10-22 Merge branch 'jc/maint-co-track'
2008-10-22 Merge branch 'rs/alloc-ref'
2008-10-22 Merge branch 'jk/fix-ls-files-other'
2008-10-21 builtin-blame: Reencode commit messages according to...
2008-10-21 Merge branch 'jc/maint-reset-remove-unmerged-new'
2008-10-21 Merge branch 'maint'
2008-10-21 rehabilitate 'git index-pack' inside the object store
2008-10-21 Merge branch 'maint'
next