Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'gf/maint-sh-setup-nongit-ok' into maint-1.6.6 | Junio C Hamano | 2010-03-07 | 1 | -1/+1 |
|\ | |||||
| * | require_work_tree broken with NONGIT_OK | Gabriel Filion | 2010-02-17 | 1 | -1/+1 |
* | | Merge branch 'jk/maint-rmdir-fix' into maint-1.6.6 | Junio C Hamano | 2010-03-07 | 2 | -1/+9 |
|\ \ | |||||
| * | | rm: fix bug in recursive subdirectory removal | Jeff King | 2010-02-18 | 2 | -1/+9 |
* | | | Merge branch 'rs/optim-text-wrap' into maint-1.6.6 | Junio C Hamano | 2010-03-07 | 3 | -37/+42 |
|\ \ \ | |||||
| * | | | utf8.c: speculatively assume utf-8 in strbuf_add_wrapped_text() | René Scharfe | 2010-02-20 | 1 | -6/+17 |
| * | | | utf8.c: remove strbuf_write() | René Scharfe | 2010-02-20 | 1 | -13/+5 |
| * | | | utf8.c: remove print_spaces() | René Scharfe | 2010-02-20 | 1 | -9/+6 |
| * | | | utf8.c: remove print_wrapped_text() | René Scharfe | 2010-02-20 | 3 | -9/+14 |
* | | | | Merge branch 'tr/maint-cherry-pick-list' into maint-1.6.6 | Junio C Hamano | 2010-03-07 | 1 | -0/+3 |
|\ \ \ \ | |||||
| * | | | | cherry_pick_list: quit early if one side is empty | Thomas Rast | 2010-02-20 | 1 | -0/+3 |
* | | | | | Merge branch 'cc/maint-bisect-paths' into maint-1.6.6 | Junio C Hamano | 2010-03-07 | 2 | -0/+11 |
|\ \ \ \ \ | |||||
| * | | | | | bisect: error out when passing bad path parameters | Christian Couder | 2010-03-01 | 2 | -0/+11 |
* | | | | | | Merge branch 'maint-1.6.5' into maint-1.6.6 | Junio C Hamano | 2010-03-04 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove extra '-' from git-am(1) | Michal Sojka | 2010-03-04 | 1 | -1/+1 |
| |/ / / / / | |||||
* | | | | | | t3301-notes: insert a shbang line in ./fake_editor.sh | Johannes Sixt | 2010-02-25 | 1 | -0/+1 |
* | | | | | | Merge branch 'maint-1.6.5' into maint-1.6.6 | Junio C Hamano | 2010-02-16 | 4 | -4/+17 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | dwim_ref: fix dangling symref warning | Jeff King | 2010-02-16 | 1 | -2/+1 |
| * | | | | | stash pop: remove 'apply' options during 'drop' invocation | Thomas Rast | 2010-02-15 | 2 | -2/+14 |
| * | | | | | diff: make sure --output=/bad/path is caught | Larry D'Anna | 2010-02-15 | 1 | -0/+2 |
* | | | | | | Remove hyphen from "git-command" in two error messages | Pete Harlan | 2010-02-15 | 2 | -2/+2 |
* | | | | | | fix minor memory leak in get_tree_entry() | René Scharfe | 2010-02-14 | 1 | -0/+1 |
* | | | | | | Fix typo in 1.6.6.2 release notes | Junio C Hamano | 2010-02-12 | 1 | -1/+1 |
* | | | | | | Re-fix check-ref-format documentation mark-up | Junio C Hamano | 2010-02-12 | 1 | -1/+1 |
* | | | | | | filter-branch: Fix error message for --prune-empty --commit-filter | Jacob Helwig | 2010-02-11 | 1 | -1/+1 |
* | | | | | | Git 1.6.6.2v1.6.6.2 | Junio C Hamano | 2010-02-10 | 4 | -3/+50 |
* | | | | | | Merge branch 'maint-1.6.5' into maint | Junio C Hamano | 2010-02-10 | 1 | -2/+4 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | t8003: check exit code of command and error message separately | Junio C Hamano | 2010-02-10 | 1 | -2/+4 |
* | | | | | | Merge branch 'sp/maint-fast-import-large-blob' into maint | Junio C Hamano | 2010-02-10 | 5 | -20/+227 |
|\ \ \ \ \ \ | |||||
| * | | | | | | fast-import: Stream very large blobs directly to pack | Shawn O. Pearce | 2010-02-01 | 5 | -20/+227 |
* | | | | | | | Merge branch 'gp/maint-cvsserver' into maint | Junio C Hamano | 2010-02-10 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | git-cvsserver: allow regex metacharacters in CVSROOT | Gerrit Pape | 2010-01-26 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'jc/maint-reflog-bad-timestamp' into maint | Junio C Hamano | 2010-02-10 | 4 | -10/+86 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t0101: use a fixed timestamp when searching in the reflog | Junio C Hamano | 2010-01-27 | 1 | -2/+2 |
| * | | | | | | | | Update @{bogus.timestamp} fix not to die() | Junio C Hamano | 2010-01-27 | 1 | -2/+2 |
| * | | | | | | | | approxidate_careful() reports errorneous date string | Junio C Hamano | 2010-01-26 | 4 | -10/+86 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'il/maint-xmallocz' into maint | Junio C Hamano | 2010-02-10 | 4 | -10/+15 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix integer overflow in unpack_compressed_entry() | Ilari Liusvaara | 2010-01-26 | 1 | -2/+1 |
| * | | | | | | | | Fix integer overflow in unpack_sha1_rest() | Ilari Liusvaara | 2010-01-26 | 1 | -2/+1 |
| * | | | | | | | | Fix integer overflow in patch_delta() | Ilari Liusvaara | 2010-01-26 | 1 | -2/+1 |
| * | | | | | | | | Add xmallocz() | Ilari Liusvaara | 2010-01-26 | 2 | -4/+12 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'jh/maint-config-file-prefix' into maint | Junio C Hamano | 2010-02-10 | 2 | -1/+12 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | builtin-config: Fix crash when using "-f <relative path>" from non-root dir | Johan Herland | 2010-01-26 | 2 | -1/+12 |
* | | | | | | | | | Merge branch 'nd/include-termios-for-osol' into maint | Junio C Hamano | 2010-02-10 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add missing #include to support TIOCGWINSZ on Solaris | Nguyễn Thái Ngọc Duy | 2010-01-11 | 1 | -0/+1 |
* | | | | | | | | | | Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge' into maint | Junio C Hamano | 2010-02-10 | 2 | -1/+58 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | checkout -m path: fix recreating conflicts | Junio C Hamano | 2010-01-06 | 2 | -1/+58 |
* | | | | | | | | | | | Merge branch 'rs/maint-archive-match-pathspec' into maint | Junio C Hamano | 2010-02-10 | 1 | -1/+24 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | archive: complain about path specs that don't match anything | René Scharfe | 2009-12-30 | 1 | -1/+24 |
| | |/ / / / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | check-ref-format documentation: fix enumeration mark-up | Junio C Hamano | 2010-02-10 | 1 | -1/+1 |