summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* git-svn testsuite: use standard configuration for Subversion toolsEygene Ryabinkin2009-05-2129-206/+221
* Merge branch 'maint'Junio C Hamano2009-05-204-3/+17
|\
| * grep: fix word-regexp colouringRené Scharfe2009-05-201-0/+5
| * completion: use git rev-parse to detect bare reposGiuseppe Bilotta2009-05-201-1/+1
| * Cope better with a _lot_ of packsJohannes Schindelin2009-05-201-0/+6
| * for-each-ref: fix segfault in copy_emailJeff King2009-05-201-2/+5
* | Extend sample pre-commit hook to check for non ascii filenamesHeiko Voigt2009-05-201-0/+25
* | Unify signedness in hashing callsDan McGee2009-05-202-6/+6
* | Merge branch 'np/push-delta'Junio C Hamano2009-05-183-8/+23
|\ \
| * | allow OFS_DELTA objects during a pushNicolas Pitre2009-05-013-8/+23
* | | Merge branch 'ar/merge-one-file-diag'Junio C Hamano2009-05-180-0/+0
|\ \ \
| * | | Clarify kind of conflict in merge-one-file helperAlex Riesen2009-04-291-2/+9
* | | | Merge branch 'ar/unlink-err'Junio C Hamano2009-05-1826-50/+68
|\ \ \ \
| * | | | print unlink(2) errno in copy_or_link_directoryAlex Riesen2009-04-291-1/+2
| * | | | replace direct calls to unlink(2) with unlink_or_warnAlex Riesen2009-04-2923-49/+44
| * | | | Introduce an unlink(2) wrapper which gives warning if unlink failedAlex Riesen2009-04-292-0/+22
* | | | | Merge branch 'jk/maint-add-empty'Junio C Hamano2009-05-181-1/+1
|\ \ \ \ \
| * | | | | add: don't complain when adding empty project rootJeff King2009-05-091-1/+1
* | | | | | Merge branch 'js/add-edit'Junio C Hamano2009-05-183-4/+187
|\ \ \ \ \ \
| * | | | | | t3702: fix reliance on SHELL_PATH being '/bin/sh'Johannes Schindelin2009-04-271-7/+19
| * | | | | | git-add: introduce --edit (to edit the diff vs. the index)Johannes Schindelin2009-04-123-4/+175
* | | | | | | Merge branch 'mh/diff-stat-color'Junio C Hamano2009-05-181-8/+7
|\ \ \ \ \ \ \
| * | | | | | | diff: do not color --stat output like patch contextMarkus Heidelberg2009-04-261-8/+7
* | | | | | | | Merge branch 'mh/show-branch-color'Junio C Hamano2009-05-184-5/+66
|\ \ \ \ \ \ \ \
| * | | | | | | | bash completion: show-branch color supportMarkus Heidelberg2009-04-251-1/+4
| * | | | | | | | show-branch: color the commit status signsMarkus Heidelberg2009-04-223-4/+62
* | | | | | | | | Merge branch 'ac/graph-horizontal-line'Junio C Hamano2009-05-182-19/+49
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | graph API: Use horizontal lines for more compact graphsAllan Caffee2009-04-222-19/+49
* | | | | | | | | | Merge branch 'ae/anon-fetch-info'Junio C Hamano2009-05-183-2/+54
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fetch: Strip usernames from url's before storing themAndreas Ericsson2009-04-213-2/+54
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'maint'Junio C Hamano2009-05-181-1/+1
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | show-branch: Fix die message in parse_reflog_param()Stephen Boyd2009-05-171-1/+1
* | | | | | | | | | Merge branch 'maint'Junio C Hamano2009-05-164-5/+8
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | completion: add missing options to show-branch and showStephen Boyd2009-05-161-2/+2
| * | | | | | | | | dir.c: clean up handling of 'path' parameter in read_directory_recursive()Linus Torvalds2009-05-161-1/+1
| * | | | | | | | | Fix type-punning issuesDan McGee2009-05-162-2/+5
* | | | | | | | | | Merge branch 'maint'Junio C Hamano2009-05-169-21/+61
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | test: checkout shouldn't say that HEAD has moved if it didn'tNanako Shiraishi2009-05-161-0/+8
| * | | | | | | | | completion: enhance "current branch" displayJunio C Hamano2009-05-161-2/+13
| * | | | | | | | | completion: simplify "current branch" in __git_ps1()Junio C Hamano2009-05-161-7/+8
| * | | | | | | | | completion: fix PS1 display during a merge on detached HEADJunio C Hamano2009-05-161-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-131-1/+3
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-05-131-1/+3
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | ls-tree manpage: output of ls-tree is compatible with update-indexAlex Riesen2009-05-101-0/+2