summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* parse-options: sanity check PARSE_OPT_NOARG flagJonathan Nieder2010-12-071-0/+13
* parse-options: move NODASH sanity checks to parse_options_checkJonathan Nieder2010-12-071-7/+7
* parse-options: clearer reporting of API misuseJonathan Nieder2010-12-071-12/+11
* parse-options: Don't call parse_options_check() so muchStephen Boyd2010-12-064-9/+8
* Merge branch 'jl/maint-pull-tags-doc' into maintJunio C Hamano2010-11-241-0/+2
|\
| * pull: Remove --tags option from manpageJens Lehmann2010-11-031-0/+2
* | Merge branch 'kb/maint-diff-ws-check' into maintJunio C Hamano2010-11-244-47/+118
|\ \
| * | diff: handle lines containing only whitespace and tabs betterKevin Ballard2010-10-202-3/+41
| * | test-lib: extend test_decode_color to handle more color codesKevin Ballard2010-10-202-44/+77
* | | Merge branch 'jm/mailmap' into maintJunio C Hamano2010-11-242-16/+61
|\ \ \
| * | | t4203: do not let "git shortlog" DWIM based on ttyJunio C Hamano2010-10-191-2/+2
| * | | t4203 (mailmap): stop hardcoding commit ids and datesJonathan Nieder2010-10-181-9/+17
| * | | mailmap: fix use of freed memoryJim Meyering2010-10-132-7/+44
* | | | Merge branch 'tr/maint-git-repack-tmpfile' into maintJunio C Hamano2010-11-241-2/+3
|\ \ \ \
| * | | | repack: place temporary packs under .git/objects/pack/Thomas Rast2010-10-191-2/+3
* | | | | Merge branch 'jk/maint-apply-no-binary' into maintJunio C Hamano2010-11-242-1/+32
|\ \ \ \ \
| * | | | | apply: don't segfault on binary files with missing dataJeff King2010-10-292-1/+32
| |/ / / /
* | | | | Merge branch 'jn/send-pack-error' into maintJunio C Hamano2010-11-241-1/+1
|\ \ \ \ \
| * | | | | send-pack: avoid redundant "pack-objects died with strange error"Jonathan Nieder2010-10-181-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'ak/submodule-sync' into maintJunio C Hamano2010-11-242-3/+14
|\ \ \ \ \
| * | | | | submodule sync: Update "submodule.<name>.url" for empty directoriesAndreas Köhler2010-10-132-3/+14
| |/ / / /
* | | | | Merge branch 'jk/maint-rev-list-nul' into maintJunio C Hamano2010-11-244-6/+16
|\ \ \ \ \
| * | | | | rev-list: handle %x00 NUL in user formatJeff King2010-10-134-6/+16
| |/ / / /
* | | | | Merge branch 'cb/diff-fname-optim' into maintJunio C Hamano2010-11-243-25/+124
|\ \ \ \ \
| * | | | | diff: avoid repeated scanning while looking for funcnameRené Scharfe2010-09-301-24/+14
| * | | | | do not search functions for patch IDClemens Buchacher2010-09-231-1/+1
| * | | | | add rebase patch id testsClemens Buchacher2010-09-231-0/+109
* | | | | | Merge branch 'jk/no-textconv-symlink' into maintJunio C Hamano2010-11-242-3/+34
|\ \ \ \ \ \
| * | | | | | diff: don't use pathname-based diff drivers for symlinksJeff King2010-09-232-3/+34
| |/ / / / /
* | | | | | Merge branch 'dk/maint-blame-el' into maintJunio C Hamano2010-11-241-0/+1
|\ \ \ \ \ \
| * | | | | | git-blame.el: Add (require 'format-spec)David Kågedal2010-11-031-0/+1
* | | | | | | Merge branch 'aw/git-p4-deletion' into maintJunio C Hamano2010-11-241-1/+3
|\ \ \ \ \ \ \
| * | | | | | | Fix handling of git-p4 on deleted filesAndrew Waters2010-10-221-1/+3
* | | | | | | | Merge branch 'kf/post-receive-sample-hook' into maintJunio C Hamano2010-11-241-16/+31
|\ \ \ \ \ \ \ \
| * | | | | | | | post-receive-email: ensure sent messages are not emptyKevin P. Fleming2010-09-101-16/+31
* | | | | | | | | Merge branch 'jk/repack-reuse-object' into maintJunio C Hamano2010-11-243-3/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Documentation: pack.compression: explain how to recompressJan Krüger2010-09-271-0/+4
| * | | | | | | | | repack: add -F flag to let user choose between --no-reuse-delta/objectJan Krüger2010-09-272-3/+9
* | | | | | | | | | Merge branch 'bc/fix-cherry-pick-root' into maintJunio C Hamano2010-11-242-1/+11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | builtin/revert.c: don't dereference a NULL pointerBrandon Casey2010-09-272-1/+11
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'uk/fix-author-ident-sed-script' into maintJunio C Hamano2010-11-241-3/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | get_author_ident_from_commit(): remove useless quotingUwe Kleine-König2010-09-271-3/+0
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'ab/makefile-track-cc' into maintJunio C Hamano2010-11-241-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Makefile: add CC to TRACK_CFLAGSÆvar Arnfjörð Bjarmason2010-09-271-1/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'mg/reset-doc' into maintJunio C Hamano2010-11-241-29/+47
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | git-reset.txt: make modes description more consistentMichael J Gruber2010-09-181-17/+26
| * | | | | | | | | | git-reset.txt: point to git-checkoutMichael J Gruber2010-09-181-0/+7
| * | | | | | | | | | git-reset.txt: use "working tree" consistentlyMichael J Gruber2010-09-181-7/+7
| * | | | | | | | | | git-reset.txt: reset --soft is not a no-opMichael J Gruber2010-09-181-4/+4
| * | | | | | | | | | git-reset.txt: reset does not change files in targetMichael J Gruber2010-09-181-2/+4