Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | parse-options: sanity check PARSE_OPT_NOARG flag | Jonathan Nieder | 2010-12-07 | 1 | -0/+13 |
* | parse-options: move NODASH sanity checks to parse_options_check | Jonathan Nieder | 2010-12-07 | 1 | -7/+7 |
* | parse-options: clearer reporting of API misuse | Jonathan Nieder | 2010-12-07 | 1 | -12/+11 |
* | parse-options: Don't call parse_options_check() so much | Stephen Boyd | 2010-12-06 | 4 | -9/+8 |
* | Merge branch 'jl/maint-pull-tags-doc' into maint | Junio C Hamano | 2010-11-24 | 1 | -0/+2 |
|\ | |||||
| * | pull: Remove --tags option from manpage | Jens Lehmann | 2010-11-03 | 1 | -0/+2 |
* | | Merge branch 'kb/maint-diff-ws-check' into maint | Junio C Hamano | 2010-11-24 | 4 | -47/+118 |
|\ \ | |||||
| * | | diff: handle lines containing only whitespace and tabs better | Kevin Ballard | 2010-10-20 | 2 | -3/+41 |
| * | | test-lib: extend test_decode_color to handle more color codes | Kevin Ballard | 2010-10-20 | 2 | -44/+77 |
* | | | Merge branch 'jm/mailmap' into maint | Junio C Hamano | 2010-11-24 | 2 | -16/+61 |
|\ \ \ | |||||
| * | | | t4203: do not let "git shortlog" DWIM based on tty | Junio C Hamano | 2010-10-19 | 1 | -2/+2 |
| * | | | t4203 (mailmap): stop hardcoding commit ids and dates | Jonathan Nieder | 2010-10-18 | 1 | -9/+17 |
| * | | | mailmap: fix use of freed memory | Jim Meyering | 2010-10-13 | 2 | -7/+44 |
* | | | | Merge branch 'tr/maint-git-repack-tmpfile' into maint | Junio C Hamano | 2010-11-24 | 1 | -2/+3 |
|\ \ \ \ | |||||
| * | | | | repack: place temporary packs under .git/objects/pack/ | Thomas Rast | 2010-10-19 | 1 | -2/+3 |
* | | | | | Merge branch 'jk/maint-apply-no-binary' into maint | Junio C Hamano | 2010-11-24 | 2 | -1/+32 |
|\ \ \ \ \ | |||||
| * | | | | | apply: don't segfault on binary files with missing data | Jeff King | 2010-10-29 | 2 | -1/+32 |
| |/ / / / | |||||
* | | | | | Merge branch 'jn/send-pack-error' into maint | Junio C Hamano | 2010-11-24 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | send-pack: avoid redundant "pack-objects died with strange error" | Jonathan Nieder | 2010-10-18 | 1 | -1/+1 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'ak/submodule-sync' into maint | Junio C Hamano | 2010-11-24 | 2 | -3/+14 |
|\ \ \ \ \ | |||||
| * | | | | | submodule sync: Update "submodule.<name>.url" for empty directories | Andreas Köhler | 2010-10-13 | 2 | -3/+14 |
| |/ / / / | |||||
* | | | | | Merge branch 'jk/maint-rev-list-nul' into maint | Junio C Hamano | 2010-11-24 | 4 | -6/+16 |
|\ \ \ \ \ | |||||
| * | | | | | rev-list: handle %x00 NUL in user format | Jeff King | 2010-10-13 | 4 | -6/+16 |
| |/ / / / | |||||
* | | | | | Merge branch 'cb/diff-fname-optim' into maint | Junio C Hamano | 2010-11-24 | 3 | -25/+124 |
|\ \ \ \ \ | |||||
| * | | | | | diff: avoid repeated scanning while looking for funcname | René Scharfe | 2010-09-30 | 1 | -24/+14 |
| * | | | | | do not search functions for patch ID | Clemens Buchacher | 2010-09-23 | 1 | -1/+1 |
| * | | | | | add rebase patch id tests | Clemens Buchacher | 2010-09-23 | 1 | -0/+109 |
* | | | | | | Merge branch 'jk/no-textconv-symlink' into maint | Junio C Hamano | 2010-11-24 | 2 | -3/+34 |
|\ \ \ \ \ \ | |||||
| * | | | | | | diff: don't use pathname-based diff drivers for symlinks | Jeff King | 2010-09-23 | 2 | -3/+34 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'dk/maint-blame-el' into maint | Junio C Hamano | 2010-11-24 | 1 | -0/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | git-blame.el: Add (require 'format-spec) | David Kågedal | 2010-11-03 | 1 | -0/+1 |
* | | | | | | | Merge branch 'aw/git-p4-deletion' into maint | Junio C Hamano | 2010-11-24 | 1 | -1/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix handling of git-p4 on deleted files | Andrew Waters | 2010-10-22 | 1 | -1/+3 |
* | | | | | | | | Merge branch 'kf/post-receive-sample-hook' into maint | Junio C Hamano | 2010-11-24 | 1 | -16/+31 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | post-receive-email: ensure sent messages are not empty | Kevin P. Fleming | 2010-09-10 | 1 | -16/+31 |
* | | | | | | | | | Merge branch 'jk/repack-reuse-object' into maint | Junio C Hamano | 2010-11-24 | 3 | -3/+13 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Documentation: pack.compression: explain how to recompress | Jan Krüger | 2010-09-27 | 1 | -0/+4 |
| * | | | | | | | | | repack: add -F flag to let user choose between --no-reuse-delta/object | Jan Krüger | 2010-09-27 | 2 | -3/+9 |
* | | | | | | | | | | Merge branch 'bc/fix-cherry-pick-root' into maint | Junio C Hamano | 2010-11-24 | 2 | -1/+11 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | builtin/revert.c: don't dereference a NULL pointer | Brandon Casey | 2010-09-27 | 2 | -1/+11 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'uk/fix-author-ident-sed-script' into maint | Junio C Hamano | 2010-11-24 | 1 | -3/+0 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | get_author_ident_from_commit(): remove useless quoting | Uwe Kleine-König | 2010-09-27 | 1 | -3/+0 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'ab/makefile-track-cc' into maint | Junio C Hamano | 2010-11-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Makefile: add CC to TRACK_CFLAGS | Ævar Arnfjörð Bjarmason | 2010-09-27 | 1 | -1/+1 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'mg/reset-doc' into maint | Junio C Hamano | 2010-11-24 | 1 | -29/+47 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | git-reset.txt: make modes description more consistent | Michael J Gruber | 2010-09-18 | 1 | -17/+26 |
| * | | | | | | | | | | git-reset.txt: point to git-checkout | Michael J Gruber | 2010-09-18 | 1 | -0/+7 |
| * | | | | | | | | | | git-reset.txt: use "working tree" consistently | Michael J Gruber | 2010-09-18 | 1 | -7/+7 |
| * | | | | | | | | | | git-reset.txt: reset --soft is not a no-op | Michael J Gruber | 2010-09-18 | 1 | -4/+4 |
| * | | | | | | | | | | git-reset.txt: reset does not change files in target | Michael J Gruber | 2010-09-18 | 1 | -2/+4 |