Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'bc/mailsplit-cr-at-eol' | Junio C Hamano | 2009-08-21 | 1 | -2/+24 |
|\ | |||||
| * | Allow mailsplit (and hence git-am) to handle mails with CRLF line-endings | Junio C Hamano | 2009-08-05 | 1 | -2/+24 |
* | | Make test number t7406- unique | Johannes Sixt | 2009-08-21 | 1 | -0/+0 |
* | | Merge branch 'tr/maint-1.6.3-add-p-modeonly-fix' | Junio C Hamano | 2009-08-18 | 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 |
* | | | svn: assume URLs from the command-line are URI-encoded | Eric Wong | 2009-08-18 | 1 | -0/+52 |
* | | | Merge branch 'jc/maint-clean-nested-dir-safety' | Junio C Hamano | 2009-08-16 | 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' | Junio C Hamano | 2009-08-16 | 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 |
* | | | | | svn: allow branches outside of refs/remotes | Adam Brewster | 2009-08-12 | 5 | -19/+48 |
* | | | | | svn: initial "master" points to trunk if possible | Eric Wong | 2009-08-12 | 2 | -1/+31 |
* | | | | | allow pull --rebase on branch yet to be born | Jeff King | 2009-08-12 | 1 | -0/+11 |
* | | | | | Merge branch 'jc/maint-merge-recursive-fix' | Junio C Hamano | 2009-08-10 | 1 | -0/+55 |
|\ \ \ \ \ | |||||
| * | | | | | merge-recursive: don't segfault while handling rename clashes | Junio C Hamano | 2009-07-30 | 1 | -0/+55 |
* | | | | | | Merge branch 'ns/am-raw-email' | Junio C Hamano | 2009-08-10 | 1 | -0/+15 |
|\ \ \ \ \ \ | |||||
| * | | | | | | am: allow individual e-mail files as input | Junio C Hamano | 2009-08-06 | 1 | -0/+15 |
* | | | | | | | Merge branch 'jp/symlink-dirs' | Junio C Hamano | 2009-08-10 | 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 'mk/grep-max-depth' | Junio C Hamano | 2009-08-10 | 1 | -1/+50 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | grep: Add --max-depth option. | MichaĆ Kiedrowicz | 2009-07-22 | 1 | -1/+50 |
* | | | | | | | | Merge branch 'js/run-command-updates' | Junio C Hamano | 2009-08-10 | 1 | -1/+4 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | run_command: report system call errors instead of returning error codes | Johannes Sixt | 2009-07-06 | 1 | -1/+4 |
* | | | | | | | | | git-svn: ignore leading blank lines in svn:ignore | Michael Haggerty | 2009-08-10 | 1 | -1/+4 |
* | | | | | | | | | svn: Add && to t9107-git-svn-migrate.sh | Adam Brewster | 2009-08-10 | 1 | -3/+11 |
* | | | | | | | | | t/Makefile: include config.mak | Jeff King | 2009-08-09 | 1 | -0/+2 |
* | | | | | | | | | tests: allow user to specify trash directory location | Jeff King | 2009-08-09 | 1 | -1/+8 |
* | | | | | | | | | tests: provide $TRASH_DIRECTORY variable | Jeff King | 2009-08-09 | 2 | -3/+3 |
* | | | | | | | | | tests: use "$TEST_DIRECTORY" instead of ".." | Jeff King | 2009-08-09 | 4 | -4/+4 |
* | | | | | | | | | t0001-init: split the existence test from the permission test | Johannes Sixt | 2009-08-09 | 1 | -0/+6 |
* | | | | | | | | | t0001-init: fix a file name | Johannes Sixt | 2009-08-09 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2009-08-07 | 1 | -3/+8 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | / / / | | |_|_|_|/ / / | |/| | | | | | | |||||
| * | | | | | | | 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 |
| | | | |\ \ \ \ \ \ \ \ \ | |||||
* | | | | \ \ \ \ \ \ \ \ \ | Merge branch 'jc/apply-epoch-patch' | Junio C Hamano | 2009-08-05 | 1 | -0/+95 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | apply: notice creation/removal patches produced by GNU diff | Junio C Hamano | 2009-07-11 | 1 | -0/+95 |
* | | | | | | | | | | | | | | | Merge branch 'ns/init-mkdir' | Junio C Hamano | 2009-08-05 | 1 | -0/+77 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | git init: optionally allow a directory argument | Nanako Shiraishi | 2009-07-25 | 1 | -0/+77 |