Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | gitweb: Load checking | John 'Warthog9' Hawley | 2010-01-30 | 2 | -0/+23 |
* | gitweb: Make running t9501 test with '--debug' reliable and usable | Jakub Narebski | 2010-01-30 | 1 | -5/+3 |
* | grep --quiet: finishing touches | Junio C Hamano | 2010-01-28 | 1 | -0/+8 |
* | reject @{-1} not at beginning of object name | Jeff King | 2010-01-28 | 1 | -1/+1 |
* | fix parsing of @{-1}@{u} combination | Jeff King | 2010-01-28 | 1 | -2/+2 |
* | test combinations of @{} syntax | Jeff King | 2010-01-28 | 1 | -0/+51 |
* | t0101: use absolute date | Jeff King | 2010-01-28 | 1 | -1/+1 |
* | tests: update tests that used to fail | Junio C Hamano | 2010-01-28 | 2 | -2/+2 |
* | Merge branch 'jc/upstream-reflog' | Junio C Hamano | 2010-01-27 | 1 | -0/+29 |
|\ | |||||
| * | Fix log -g this@{upstream} | Junio C Hamano | 2010-01-26 | 1 | -0/+29 |
* | | Merge branch 'jc/maint-reflog-bad-timestamp' | Junio C Hamano | 2010-01-27 | 1 | -0/+45 |
|\ \ | |||||
| * | | t0101: use a fixed timestamp when searching in the reflog | Junio C Hamano | 2010-01-27 | 1 | -2/+2 |
| * | | approxidate_careful() reports errorneous date string | Junio C Hamano | 2010-01-26 | 1 | -0/+45 |
* | | | Merge branch 'jh/maint-config-file-prefix' | Junio C Hamano | 2010-01-27 | 1 | -0/+11 |
|\ \ \ | |||||
| * | | | builtin-config: Fix crash when using "-f <relative path>" from non-root dir | Johan Herland | 2010-01-26 | 1 | -0/+11 |
* | | | | Merge branch 'jl/diff-submodule-ignore' | Junio C Hamano | 2010-01-26 | 1 | -0/+67 |
|\ \ \ \ | |||||
| * | | | | Teach diff --submodule that modified submodule directory is dirty | Jens Lehmann | 2010-01-24 | 1 | -0/+67 |
* | | | | | fix portability issues with $ in double quotes | Stephen Boyd | 2010-01-26 | 9 | -48/+48 |
| |_|_|/ |/| | | | |||||
* | | | | am: fix patch format detection for Thunderbird "Save As" emails | Stephen Boyd | 2010-01-25 | 1 | -0/+15 |
* | | | | t0022: replace non-portable literal CR | Stephen Boyd | 2010-01-25 | 1 | -1/+1 |
* | | | | tests: consolidate CR removal/addition functions | Stephen Boyd | 2010-01-25 | 6 | -58/+37 |
* | | | | t5541-http-push: make grep expression check for one line only | Tay Ray Chuan | 2010-01-25 | 1 | -8/+4 |
* | | | | Merge branch 'jc/fix-tree-walk' | Junio C Hamano | 2010-01-24 | 11 | -20/+110 |
|\ \ \ \ | |||||
| * | | | | unpack-trees.c: look ahead in the index | Junio C Hamano | 2010-01-07 | 1 | -4/+4 |
| * | | | | Aggressive three-way merge: fix D/F case | Junio C Hamano | 2010-01-03 | 1 | -1/+1 |
| * | | | | traverse_trees(): handle D/F conflict case sanely | Junio C Hamano | 2010-01-03 | 2 | -3/+3 |
| * | | | | more D/F conflict tests | Junio C Hamano | 2010-01-03 | 1 | -0/+102 |
| * | | | | tests: move convenience regexp to match object names to test-lib.sh | Junio C Hamano | 2010-01-03 | 9 | -18/+6 |
* | | | | | Make test numbers unique | Johannes Sixt | 2010-01-24 | 1 | -0/+0 |
* | | | | | pull: re-fix command line generation | Junio C Hamano | 2010-01-24 | 1 | -0/+35 |
| |/ / / |/| | | | |||||
* | | | | Merge git://git.bogomips.org/git-svn | Junio C Hamano | 2010-01-23 | 7 | -127/+849 |
|\ \ \ \ | |||||
| * | | | | git-svn: allow subset of branches/tags to be specified in glob spec | Jay Soffian | 2010-01-23 | 2 | -0/+264 |
| * | | | | git-svn: allow UUID to be manually remapped via rewriteUUID | Jay Soffian | 2010-01-23 | 2 | -0/+100 |
| * | | | | git-svn: update svn mergeinfo test suite | Andrew Myrick | 2010-01-23 | 3 | -127/+485 |
* | | | | | t7800-difftool.sh: Test mergetool.prompt fallback | David Aguilar | 2010-01-22 | 1 | -0/+12 |
|/ / / / | |||||
* | | | | Merge branch 'maint' | Junio C Hamano | 2010-01-22 | 1 | -0/+6 |
|\ \ \ \ | |||||
| * | | | | ignore duplicated slashes in make_relative_path() | Junio C Hamano | 2010-01-22 | 1 | -0/+6 |
* | | | | | Merge branch 'jc/branch-d' | Junio C Hamano | 2010-01-22 | 1 | -0/+26 |
|\ \ \ \ \ | |||||
| * | | | | | branch -d: base the "already-merged" safety on the branch it merges with | Junio C Hamano | 2009-12-30 | 1 | -0/+26 |
* | | | | | | Merge branch 'il/rev-glob' | Junio C Hamano | 2010-01-22 | 1 | -0/+195 |
|\ \ \ \ \ \ | |||||
| * | | | | | | rev-parse --branches/--tags/--remotes=pattern | Ilari Liusvaara | 2010-01-20 | 1 | -1/+62 |
| * | | | | | | rev-parse --glob | Ilari Liusvaara | 2010-01-20 | 1 | -0/+134 |
* | | | | | | | Merge branch 'js/refer-upstream' | Junio C Hamano | 2010-01-22 | 1 | -0/+110 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Teach @{upstream} syntax to strbuf_branchanme() | Junio C Hamano | 2010-01-20 | 1 | -3/+3 |
| * | | | | | | | t1506: more test for @{upstream} syntax | Junio C Hamano | 2010-01-20 | 1 | -0/+41 |
| * | | | | | | | Introduce <branch>@{upstream} notation | Johannes Schindelin | 2010-01-12 | 1 | -0/+69 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'jl/submodule-diff' | Junio C Hamano | 2010-01-22 | 4 | -19/+154 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | git status: Show uncommitted submodule changes too when enabled | Jens Lehmann | 2010-01-17 | 2 | -3/+3 |
| * | | | | | | | Teach diff that modified submodule directory is dirty | Junio C Hamano | 2010-01-16 | 1 | -1/+83 |
| * | | | | | | | Show submodules as modified when they contain a dirty work tree | Jens Lehmann | 2010-01-16 | 1 | -15/+68 |