Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | git-add--interactive: never skip files included in index | Pauli Virtanen | 2009-10-10 | 1 | -0/+14 |
* | Merge branch 'jc/maint-1.6.4-show-branch-default' into maint | Junio C Hamano | 2009-10-04 | 1 | -0/+8 |
|\ | |||||
| * | show-branch: fix segfault when showbranch.default exists | Junio C Hamano | 2009-10-04 | 1 | -0/+8 |
* | | Merge branch 'jc/maint-unpack-objects-strict' into maint | Junio C Hamano | 2009-09-16 | 1 | -0/+35 |
|\ \ | |||||
| * | | Fix "unpack-objects --strict" | Junio C Hamano | 2009-08-14 | 1 | -0/+35 |
* | | | Merge branch 'jk/maint-1.6.3-checkout-unborn' into maint | Junio C Hamano | 2009-09-16 | 1 | -0/+40 |
|\ \ \ | |||||
| * | | | checkout: do not imply "-f" on unborn branches | Jeff King | 2009-08-25 | 1 | -0/+40 |
| |/ / | |||||
* | | | Merge branch 'jc/maint-checkout-index-to-prefix' into maint | Junio C Hamano | 2009-09-16 | 1 | -0/+9 |
|\ \ \ | |||||
| * | | | check_path(): allow symlinked directories to checkout-index --prefix | Junio C Hamano | 2009-08-18 | 1 | -0/+9 |
* | | | | svn: properly escape arguments for authors-prog | Mark Lodato | 2009-09-13 | 1 | -0/+14 |
* | | | | Merge branch 'cb/maint-1.6.3-grep-relative-up' into maint | Junio C Hamano | 2009-09-13 | 1 | -0/+17 |
|\ \ \ \ | |||||
| * | | | | grep: accept relative paths outside current working directory | Clemens Buchacher | 2009-09-07 | 1 | -0/+17 |
* | | | | | Merge branch 'maint-1.6.3' into maint | Junio C Hamano | 2009-09-03 | 1 | -2/+4 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'maint-1.6.2' into maint-1.6.3 | Junio C Hamano | 2009-09-03 | 1 | -2/+4 |
| |\ \ \ \ \ | |||||
| | * | | | | | clone: disconnect transport after fetching | Jeff King | 2009-09-02 | 1 | -2/+4 |
* | | | | | | | Remove unused t/t8005/iso8859-5.txt | Nanako Shiraishi | 2009-08-29 | 1 | -2/+0 |
* | | | | | | | git-log: allow --decorate[=short|full] | Lars Hjemli | 2009-08-26 | 2 | -0/+35 |
* | | | | | | | git-bisect: call the found commit "*the* first bad commit" | Nanako Shiraishi | 2009-08-26 | 1 | -9/+9 |
* | | | | | | | Merge branch 'jc/maint-clean-nested-dir-safety' into maint | Junio C Hamano | 2009-08-26 | 1 | -0/+39 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | clean: require double -f options to nuke nested git repository and work tree | Junio C Hamano | 2009-07-29 | 1 | -0/+39 |
* | | | | | | | | Merge branch 'jk/maint-merge-msg-fix' into maint | Junio C Hamano | 2009-08-26 | 3 | -3/+63 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | merge: indicate remote tracking branches in merge message | Jeff King | 2009-08-09 | 2 | -1/+11 |
| * | | | | | | | | merge: fix incorrect merge message for ambiguous tag/branch | Jeff King | 2009-08-09 | 2 | -3/+3 |
| * | | | | | | | | add tests for merge message headings | Jeff King | 2009-08-09 | 1 | -0/+50 |
* | | | | | | | | | Merge branch 'jc/apply-epoch-patch' into maint | Junio C Hamano | 2009-08-26 | 1 | -0/+95 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | apply: notice creation/removal patches produced by GNU diff | Junio C Hamano | 2009-07-11 | 1 | -0/+95 |
* | | | | | | | | | | Merge branch 'jp/symlink-dirs' into maint | Junio C Hamano | 2009-08-26 | 1 | -0/+93 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | t6035-merge-dir-to-symlink depends on SYMLINKS prerequisite | Johannes Sixt | 2009-08-09 | 1 | -0/+6 |
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
| * | | | | | | | | | git-checkout: be careful about untracked symlinks | Linus Torvalds | 2009-07-29 | 1 | -1/+1 |
| * | | | | | | | | | lstat_cache: guard against full match of length of 'name' parameter | Kjetil Barvik | 2009-07-29 | 1 | -1/+1 |
| * | | | | | | | | | Demonstrate bugs when a directory is replaced with a symlink | Pickens, James E | 2009-07-29 | 1 | -0/+87 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'maint-1.6.3' into maint | Junio C Hamano | 2009-08-26 | 1 | -0/+11 |
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Merge branch 'tr/maint-1.6.3-add-p-modeonly-fix' into maint-1.6.3 | Junio C Hamano | 2009-08-26 | 1 | -0/+11 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
| | * | | | | | | | add -p: do not attempt to coalesce mode changes | Thomas Rast | 2009-08-15 | 1 | -1/+1 |
| | * | | | | | | | git add -p: demonstrate failure when staging both mode and hunk | Kirill Smelkov | 2009-08-15 | 1 | -0/+11 |
* | | | | | | | | | Merge branch 'bc/maint-am-email' into maint | Junio C Hamano | 2009-08-21 | 1 | -0/+15 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | am: allow individual e-mail files as input | Junio C Hamano | 2009-08-10 | 1 | -0/+15 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'jc/maint-merge-recursive-fix' into maint | Junio C Hamano | 2009-08-21 | 1 | -0/+55 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | merge-recursive: don't segfault while handling rename clashes | Junio C Hamano | 2009-07-30 | 1 | -0/+55 |
* | | | | | | | | | | Merge branch 'sb/maint-pull-rebase' into maint | Junio C Hamano | 2009-08-21 | 1 | -0/+13 |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | pull: support rebased upstream + fetch + pull --rebase | Santi Béjar | 2009-07-19 | 1 | -3/+2 |
| * | | | | | | | | | t5520-pull: Test for rebased upstream + fetch + pull --rebase | Santi Béjar | 2009-07-19 | 1 | -0/+14 |
* | | | | | | | | | | Merge branch 'maint-1.6.3' into maint | Junio C Hamano | 2009-08-07 | 1 | -3/+8 |
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'maint-1.6.2' into maint-1.6.3 | Junio C Hamano | 2009-08-07 | 1 | -3/+8 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | | | |||||
| | * | | | | | | | | Merge branch 'maint-1.6.1' into maint-1.6.2 | Junio C Hamano | 2009-08-07 | 1 | -3/+8 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ | Merge branch 'maint-1.6.0' into maint-1.6.1 | Junio C Hamano | 2009-08-07 | 1 | -3/+8 |
| | | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / / | | | |/| | | | | | | | |||||
| | | | * | | | | | | | t5510: harden the way verify-pack is used | Junio C Hamano | 2009-08-07 | 1 | -3/+8 |
| | | * | | | | | | | | Merge branch 'jc/maint-1.6.0-keep-pack' into maint-1.6.1 | Junio C Hamano | 2009-05-03 | 1 | -0/+61 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ | Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maint-1.6.1 | Junio C Hamano | 2009-05-03 | 1 | -0/+8 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ | Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into maint-1.6.1 | Junio C Hamano | 2009-05-03 | 2 | -0/+14 |
| | | |\ \ \ \ \ \ \ \ \ \ |