Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge-recursive: never leave index unmerged while recursing | Dave Olszewski | 2009-05-09 | 2 | -5/+101 |
* | GIT 1.6.2.5v1.6.2.5 | Junio C Hamano | 2009-05-03 | 3 | -2/+23 |
* | Merge branch 'np/maint-no-ofs-delta' into maint | Junio C Hamano | 2009-05-03 | 1 | -1/+12 |
|\ | |||||
| * | honor repack.usedeltabaseoffset when fetching packs | Nicolas Pitre | 2009-05-01 | 1 | -1/+12 |
* | | Merge branch 'maint-1.6.1' into maint | Junio C Hamano | 2009-05-03 | 1 | -0/+25 |
|\ \ | |||||
| * | | GIT 1.6.1.4v1.6.1.4 | Junio C Hamano | 2009-05-03 | 2 | -1/+26 |
| * | | Merge branch 'jc/maint-1.6.0-keep-pack' into maint-1.6.1 | Junio C Hamano | 2009-05-03 | 11 | -74/+105 |
| |\ \ | |||||
| * \ \ | Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maint-1.6.1 | Junio C Hamano | 2009-05-03 | 2 | -1/+17 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into maint-1.6.1 | Junio C Hamano | 2009-05-03 | 4 | -5/+29 |
| |\ \ \ \ | |||||
* | \ \ \ \ | Merge branch 'jc/maint-read-tree-multi' into maint | Junio C Hamano | 2009-05-03 | 4 | -41/+55 |
|\ \ \ \ \ \ | |||||
| * | | | | | | checkout branch: prime cache-tree fully | Junio C Hamano | 2009-04-20 | 1 | -1/+8 |
| * | | | | | | read-tree -m A B: prime cache-tree from the switched-to tree | Junio C Hamano | 2009-04-20 | 1 | -0/+5 |
| * | | | | | | Move prime_cache_tree() to cache-tree.c | Junio C Hamano | 2009-04-20 | 4 | -36/+40 |
| * | | | | | | read-tree A B: do not corrupt cache-tree | Junio C Hamano | 2009-04-20 | 1 | -4/+2 |
* | | | | | | | Merge branch 'mk/maint-apply-swap' into maint | Junio C Hamano | 2009-05-03 | 2 | -7/+112 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | tests: make test-apply-criss-cross-rename more robust | Michał Kiedrowicz | 2009-04-20 | 1 | -3/+31 |
| * | | | | | | | builtin-apply: keep information about files to be deleted | Michał Kiedrowicz | 2009-04-20 | 2 | -8/+47 |
| * | | | | | | | tests: test applying criss-cross rename patch | Michał Kiedrowicz | 2009-04-20 | 1 | -0/+38 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'mm/maint-add-p-quit' into maint | Junio C Hamano | 2009-05-03 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | git add -p: add missing "q" to patch prompt | Wincent Colaiuta | 2009-04-20 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'lt/pack-object-memuse' into maint | Junio C Hamano | 2009-05-03 | 7 | -43/+56 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | show_object(): push path_name() call further down | Linus Torvalds | 2009-04-12 | 7 | -14/+20 |
| * | | | | | | | process_{tree,blob}: show objects without buffering | Linus Torvalds | 2009-04-12 | 7 | -41/+48 |
* | | | | | | | | Merge branch 'maint-1.6.1' into maint | Junio C Hamano | 2009-04-29 | 2 | -12/+65 |
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||||
| * | | | | | | | Merge branch 'maint-1.6.0' into maint-1.6.1 | Junio C Hamano | 2009-04-29 | 2 | -12/+65 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | diff -c -p: do not die on submodules | Junio C Hamano | 2009-04-29 | 2 | -12/+65 |
* | | | | | | | | | Merge branch 'maint-1.6.1' into maint | Junio C Hamano | 2009-04-28 | 4 | -4/+12 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Merge branch 'maint-1.6.0' into maint-1.6.1 | Junio C Hamano | 2009-04-28 | 4 | -4/+12 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | grep: fix segfault when "git grep '('" is given | Linus Torvalds | 2009-04-27 | 2 | -2/+10 |
| | * | | | | | | | Documentation: fix a grammatical error in api-builtin.txt | Allan Caffee | 2009-04-27 | 1 | -1/+1 |
| | * | | | | | | | builtin-merge: fix a typo in an error message | Allan Caffee | 2009-04-27 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'maint-1.6.1' into maint | Junio C Hamano | 2009-04-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Merge branch 'maint-1.6.0' into maint-1.6.1 | Junio C Hamano | 2009-04-24 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | test-genrandom: Add newline to usage string | Stephen Boyd | 2009-04-23 | 1 | -1/+1 |
* | | | | | | | | | gitcvs-migration: Link to git-cvsimport documentation | Frank Lichtenheld | 2009-04-20 | 1 | -1/+1 |
* | | | | | | | | | Fix off-by-one in read_tree_recursive | Johannes Schindelin | 2009-04-20 | 1 | -0/+1 |
| |_|_|_|/ / / / |/| | | | | | | | |||||
* | | | | | | | | GIT 1.6.2.4v1.6.2.4 | Junio C Hamano | 2009-04-19 | 2 | -2/+10 |
* | | | | | | | | Makefile: remove {fetch,send}-pack from PROGRAMS as they are builtins | Nguyễn Thái Ngọc Duy | 2009-04-19 | 1 | -2/+0 |
* | | | | | | | | Merge branch 'ef/maint-fast-export' into maint | Junio C Hamano | 2009-04-19 | 2 | -2/+26 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | builtin-fast-export.c: handle nested tags | Erik Faye-Lund | 2009-04-19 | 2 | -3/+6 |
| * | | | | | | | | builtin-fast-export.c: fix crash on tagged trees | Erik Faye-Lund | 2009-04-19 | 2 | -3/+6 |
| * | | | | | | | | builtin-fast-export.c: turn error into warning | Erik Faye-Lund | 2009-04-19 | 1 | -2/+4 |
| * | | | | | | | | test-suite: adding a test for fast-export with tag variants | Erik Faye-Lund | 2009-04-19 | 1 | -0/+16 |
* | | | | | | | | | Merge branch 'mm/maint-add-p-quit' into maint | Junio C Hamano | 2009-04-19 | 2 | -39/+38 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | |||||
| * | | | | | | | | Update git-add.txt according to the new possibilities of 'git add -p'. | Matthieu Moy | 2009-04-19 | 1 | -1/+3 |
| * | | | | | | | | add-interactive: refactor mode hunk handling | Jeff King | 2009-04-19 | 1 | -43/+21 |
| * | | | | | | | | git add -p: new "quit" command at the prompt. | Matthieu Moy | 2009-04-19 | 2 | -1/+20 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'lt/maint-reflog-expire' into maint | Junio C Hamano | 2009-04-19 | 1 | -6/+70 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Speed up reflog pruning of unreachable commits | Junio Hamano | 2009-04-19 | 1 | -0/+44 |
| * | | | | | | | | Clean up reflog unreachability pruning decision | Linus Torvalds | 2009-04-19 | 1 | -6/+26 |
| |/ / / / / / / |