summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | format-patch let -k override a config-specified format.numberedJim Meyering2009-05-092-1/+20
* | | | | | | | | | | Merge branch 'do/maint-merge-recursive-fix' into maintJunio C Hamano2009-05-252-5/+101
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | merge-recursive: never leave index unmerged while recursingDave Olszewski2009-05-092-5/+101
* | | | | | | | | | | | Merge branch 'jk/maint-1.6.0-trace-argv' into maintJunio C Hamano2009-05-251-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | fix GIT_TRACE segfault with shell-quoted aliasesJeff King2009-05-091-4/+4
* | | | | | | | | | | | | Merge branch 'np/push-delta' into maintJunio C Hamano2009-05-253-8/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | allow OFS_DELTA objects during a pushNicolas Pitre2009-05-013-8/+23
* | | | | | | | | | | | | | Merge branch 'ar/merge-one-file-diag' into maintJunio C Hamano2009-05-250-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Clarify kind of conflict in merge-one-file helperAlex Riesen2009-04-291-2/+9
* | | | | | | | | | | | | | | Merge branch 'ar/unlink-err' into maintJunio C Hamano2009-05-2526-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' into maintJunio C Hamano2009-05-251-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-241-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | / / | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'maint-1.6.1' into maint-1.6.2Junio C Hamano2009-05-241-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-05-241-1/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | http-push.c::remove_locks(): fix use after freeAlex Riesen2009-05-241-1/+2
* | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | 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-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
* | | | | | | | | | | | | | | 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
| | | * | | | | | | | | | 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-122-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-080-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |