summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'gf/maint-sh-setup-nongit-ok' into maint-1.6.6Junio C Hamano2010-03-071-1/+1
|\
| * require_work_tree broken with NONGIT_OKGabriel Filion2010-02-171-1/+1
* | Merge branch 'jk/maint-rmdir-fix' into maint-1.6.6Junio C Hamano2010-03-072-1/+9
|\ \
| * | rm: fix bug in recursive subdirectory removalJeff King2010-02-182-1/+9
* | | Merge branch 'rs/optim-text-wrap' into maint-1.6.6Junio C Hamano2010-03-073-37/+42
|\ \ \
| * | | utf8.c: speculatively assume utf-8 in strbuf_add_wrapped_text()René Scharfe2010-02-201-6/+17
| * | | utf8.c: remove strbuf_write()René Scharfe2010-02-201-13/+5
| * | | utf8.c: remove print_spaces()René Scharfe2010-02-201-9/+6
| * | | utf8.c: remove print_wrapped_text()René Scharfe2010-02-203-9/+14
* | | | Merge branch 'tr/maint-cherry-pick-list' into maint-1.6.6Junio C Hamano2010-03-071-0/+3
|\ \ \ \
| * | | | cherry_pick_list: quit early if one side is emptyThomas Rast2010-02-201-0/+3
* | | | | Merge branch 'cc/maint-bisect-paths' into maint-1.6.6Junio C Hamano2010-03-072-0/+11
|\ \ \ \ \
| * | | | | bisect: error out when passing bad path parametersChristian Couder2010-03-012-0/+11
* | | | | | Merge branch 'maint-1.6.5' into maint-1.6.6Junio C Hamano2010-03-041-1/+1
|\ \ \ \ \ \
| * | | | | | Remove extra '-' from git-am(1)Michal Sojka2010-03-041-1/+1
| |/ / / / /
* | | | | | t3301-notes: insert a shbang line in ./fake_editor.shJohannes Sixt2010-02-251-0/+1
* | | | | | Merge branch 'maint-1.6.5' into maint-1.6.6Junio C Hamano2010-02-164-4/+17
|\ \ \ \ \ \ | |/ / / / /
| * | | | | dwim_ref: fix dangling symref warningJeff King2010-02-161-2/+1
| * | | | | stash pop: remove 'apply' options during 'drop' invocationThomas Rast2010-02-152-2/+14
| * | | | | diff: make sure --output=/bad/path is caughtLarry D'Anna2010-02-151-0/+2
* | | | | | Remove hyphen from "git-command" in two error messagesPete Harlan2010-02-152-2/+2
* | | | | | fix minor memory leak in get_tree_entry()René Scharfe2010-02-141-0/+1
* | | | | | Fix typo in 1.6.6.2 release notesJunio C Hamano2010-02-121-1/+1
* | | | | | Re-fix check-ref-format documentation mark-upJunio C Hamano2010-02-121-1/+1
* | | | | | filter-branch: Fix error message for --prune-empty --commit-filterJacob Helwig2010-02-111-1/+1
* | | | | | Git 1.6.6.2v1.6.6.2Junio C Hamano2010-02-104-3/+50
* | | | | | Merge branch 'maint-1.6.5' into maintJunio C Hamano2010-02-101-2/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | t8003: check exit code of command and error message separatelyJunio C Hamano2010-02-101-2/+4
* | | | | | Merge branch 'sp/maint-fast-import-large-blob' into maintJunio C Hamano2010-02-105-20/+227
|\ \ \ \ \ \
| * | | | | | fast-import: Stream very large blobs directly to packShawn O. Pearce2010-02-015-20/+227
* | | | | | | Merge branch 'gp/maint-cvsserver' into maintJunio C Hamano2010-02-101-1/+1
|\ \ \ \ \ \ \
| * | | | | | | git-cvsserver: allow regex metacharacters in CVSROOTGerrit Pape2010-01-261-1/+1
* | | | | | | | Merge branch 'jc/maint-reflog-bad-timestamp' into maintJunio C Hamano2010-02-104-10/+86
|\ \ \ \ \ \ \ \
| * | | | | | | | t0101: use a fixed timestamp when searching in the reflogJunio C Hamano2010-01-271-2/+2
| * | | | | | | | Update @{bogus.timestamp} fix not to die()Junio C Hamano2010-01-271-2/+2
| * | | | | | | | approxidate_careful() reports errorneous date stringJunio C Hamano2010-01-264-10/+86
| |/ / / / / / /
* | | | | | | | Merge branch 'il/maint-xmallocz' into maintJunio C Hamano2010-02-104-10/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix integer overflow in unpack_compressed_entry()Ilari Liusvaara2010-01-261-2/+1
| * | | | | | | | Fix integer overflow in unpack_sha1_rest()Ilari Liusvaara2010-01-261-2/+1
| * | | | | | | | Fix integer overflow in patch_delta()Ilari Liusvaara2010-01-261-2/+1
| * | | | | | | | Add xmallocz()Ilari Liusvaara2010-01-262-4/+12
| |/ / / / / / /
* | | | | | | | Merge branch 'jh/maint-config-file-prefix' into maintJunio C Hamano2010-02-102-1/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | builtin-config: Fix crash when using "-f <relative path>" from non-root dirJohan Herland2010-01-262-1/+12
* | | | | | | | | Merge branch 'nd/include-termios-for-osol' into maintJunio C Hamano2010-02-101-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add missing #include to support TIOCGWINSZ on SolarisNguyễn Thái Ngọc Duy2010-01-111-0/+1
* | | | | | | | | | Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge' into maintJunio C Hamano2010-02-102-1/+58
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | checkout -m path: fix recreating conflictsJunio C Hamano2010-01-062-1/+58
* | | | | | | | | | | Merge branch 'rs/maint-archive-match-pathspec' into maintJunio C Hamano2010-02-101-1/+24
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | archive: complain about path specs that don't match anythingRené Scharfe2009-12-301-1/+24
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | check-ref-format documentation: fix enumeration mark-upJunio C Hamano2010-02-101-1/+1