summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ar/unlink-err' into maintJunio C Hamano2009-05-2626-50/+68
|\
| * print unlink(2) errno in copy_or_link_directoryAlex Riesen2009-04-301-1/+2
| * replace direct calls to unlink(2) with unlink_or_warnAlex Riesen2009-04-3023-49/+44
| * Introduce an unlink(2) wrapper which gives warning if unlink failedAlex Riesen2009-04-302-0/+22
* | Merge branch 'jk/maint-add-empty' into maintJunio C Hamano2009-05-261-1/+1
|\ \
| * | add: don't complain when adding empty project rootJeff King2009-05-091-1/+1
* | | fix cat-file usage message and documentationJeff King2009-05-252-4/+4
* | | fetch: report ref storage DF errors more accuratelyJeff King2009-05-251-3/+8
* | | lock_ref: inform callers of unavailable refJeff King2009-05-251-1/+3
* | | merge-options.txt: Clarify merge --squashMichael J Gruber2009-05-251-1/+2
* | | Merge branch 'maint-1.6.2' into maintJunio C Hamano2009-05-251-1/+2
|\ \ \
| * \ \ Merge branch 'maint-1.6.1' into maint-1.6.2Junio C Hamano2009-05-251-1/+2
| |\ \ \
| | * \ \ Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-05-251-1/+2
| | |\ \ \
| | | * | | http-push.c::remove_locks(): fix use after freeAlex Riesen2009-05-241-1/+2
* | | | | | grep: fix word-regexp colouringRené Scharfe2009-05-211-0/+5
* | | | | | completion: use git rev-parse to detect bare reposGiuseppe Bilotta2009-05-211-1/+1
* | | | | | Cope better with a _lot_ of packsJohannes Schindelin2009-05-211-0/+6
* | | | | | for-each-ref: fix segfault in copy_emailJeff King2009-05-201-2/+5
* | | | | | show-branch: Fix die message in parse_reflog_param()Stephen Boyd2009-05-171-1/+1
* | | | | | completion: add missing options to show-branch and showStephen Boyd2009-05-171-2/+2
* | | | | | dir.c: clean up handling of 'path' parameter in read_directory_recursive()Linus Torvalds2009-05-171-1/+1
* | | | | | Fix type-punning issuesDan McGee2009-05-172-2/+5
* | | | | | test: checkout shouldn't say that HEAD has moved if it didn'tNanako Shiraishi2009-05-171-0/+8
* | | | | | completion: enhance "current branch" displayJunio C Hamano2009-05-171-2/+13
* | | | | | completion: simplify "current branch" in __git_ps1()Junio C Hamano2009-05-171-7/+8
* | | | | | completion: fix PS1 display during a merge on detached HEADJunio C Hamano2009-05-171-3/+3
* | | | | | builtin-checkout: Don't tell user that HEAD has moved before it hasDaniel Cordero2009-05-161-8/+8
* | | | | | pre-commit.sample: don't print incidental SHA1Jim Meyering2009-05-161-1/+1
* | | | | | tests: Add tests for missing format-patch long optionsStephen Boyd2009-05-162-0/+17
* | | | | | api-parse-options.txt: use 'func' instead of 'funct'Stephen Boyd2009-05-161-1/+1
* | | | | | Turn on USE_ST_TIMESPEC for OpenBSDTony Kemp2009-05-161-0/+1
* | | | | | Merge branch 'maint-1.6.2' into maintJunio C Hamano2009-05-161-1/+3
|\| | | | |
| * | | | | Merge branch 'maint-1.6.1' into maint-1.6.2Junio C Hamano2009-05-141-1/+3
| |\| | | |
| | * | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-05-141-1/+3
| | |\| | |
| | | * | | ls-tree manpage: output of ls-tree is compatible with update-indexAlex Riesen2009-05-101-0/+2
| | | * | | ls-tree manpage: use "unless" instead of "when ... is not"Alex Riesen2009-05-101-1/+1
* | | | | | GIT 1.6.3.1v1.6.3.1Junio C Hamano2009-05-132-7/+5
* | | | | | Merge branch 'maint-1.6.2' into maintJunio C Hamano2009-05-122-8/+29
|\| | | | | | |_|_|/ / |/| | | |
| * | | | Merge branch 'jc/maint-read-tree-multi' into maint-1.6.2Junio C Hamano2009-05-122-8/+29
| |\ \ \ \
| | * | | | Revert "checkout branch: prime cache-tree fully"Junio C Hamano2009-05-122-8/+29
| * | | | | Merge branch 'maint-1.6.1' into maint-1.6.2Junio C Hamano2009-05-090-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-05-091-2/+2
| | |\ \ \ \ | | | | |/ / | | | |/| |
* | | | | | Documentation: cloning to empty directory is allowedAlexander Potashev2009-05-091-1/+1
* | | | | | Clarify kind of conflict in merge-one-file helperAlex Riesen2009-05-091-2/+9
* | | | | | git config: clarify --add and --get-colorFelipe Contreras2009-05-091-2/+3
* | | | | | archive-tar.c: squelch a type mismatch warningJunio C Hamano2009-05-091-1/+1
* | | | | | Start 1.6.3.1 maintenance series.Junio C Hamano2009-05-092-1/+13
* | | | | | GIT 1.6.3v1.6.3Junio C Hamano2009-05-073-8/+4
* | | | | | t4029: use sh instead of bashNguyễn Thái Ngọc Duy2009-05-071-1/+1
* | | | | | t4200: convert sed expression which operates on non-text file to perlBrandon Casey2009-05-071-1/+1