Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jc/maint-diff-patch-header' into maint | Junio C Hamano | 2012-03-12 | 2 | -86/+111 |
|\ | |||||
| * | diff -p: squelch "diff --git" header for stat-dirty paths | Junio C Hamano | 2012-03-01 | 2 | -5/+2 |
| * | t4011: illustrate "diff-index -p" on stat-dirty paths | Junio C Hamano | 2012-03-01 | 1 | -7/+39 |
| * | t4011: modernise style | Junio C Hamano | 2012-03-01 | 1 | -86/+82 |
* | | Merge branch 'jn/maint-do-not-match-with-unsanitized-searchtext' into maint | Junio C Hamano | 2012-03-12 | 1 | -8/+8 |
|\ \ | |||||
| * | | gitweb: Fix fixed string (non-regexp) project search | Jakub Narebski | 2012-03-06 | 1 | -8/+8 |
* | | | Merge branch 'jc/am-3-nonstandard-popt' into maint | Junio C Hamano | 2012-03-12 | 2 | -4/+22 |
|\ \ \ | |||||
| * | | | test: "am -3" can accept non-standard -p<num> | Junio C Hamano | 2012-02-27 | 1 | -0/+15 |
| * | | | am -3: allow nonstandard -p<num> option | Junio C Hamano | 2012-02-23 | 1 | -4/+7 |
* | | | | t5704: fix nonportable sed/grep usages | Thomas Rast | 2012-03-06 | 1 | -2/+2 |
* | | | | Merge branch 'maint-1.7.8' into maint | Junio C Hamano | 2012-03-06 | 1 | -0/+3 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'maint-1.7.7' into maint-1.7.8 | Junio C Hamano | 2012-03-06 | 1 | -0/+3 |
| |\ \ \ \ | |||||
| | * | | | | Document the --histogram diff option | Thomas Rast | 2012-03-06 | 1 | -0/+3 |
* | | | | | | Git 1.7.9.3v1.7.9.3 | Junio C Hamano | 2012-03-05 | 2 | -2/+3 |
* | | | | | | Merge branch 'jc/doc-merge-options' into maint | Junio C Hamano | 2012-03-05 | 1 | -11/+11 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Documentation/merge-options.txt: group "ff" related options together | Junio C Hamano | 2012-02-23 | 1 | -11/+11 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'cn/maint-rev-list-doc' into maint | Junio C Hamano | 2012-03-05 | 1 | -6/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Documentation: use {asterisk} in rev-list-options.txt when needed | Carlos Martín Nieto | 2012-02-28 | 1 | -6/+6 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | fast-import: zero all of 'struct tag' to silence valgrind | Thomas Rast | 2012-03-05 | 1 | -1/+1 |
* | | | | | | Update draft release notes to 1.7.9.3 for the last time | Junio C Hamano | 2012-03-05 | 1 | -0/+27 |
* | | | | | | Merge branch 'cn/maint-branch-with-bad' into maint | Junio C Hamano | 2012-03-05 | 2 | -0/+8 |
|\ \ \ \ \ \ | |||||
| * | | | | | | branch: don't assume the merge filter ref exists | Carlos Martín Nieto | 2012-02-27 | 2 | -0/+8 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'jn/maint-gitweb-invalid-regexp' into maint | Junio C Hamano | 2012-03-05 | 2 | -1/+20 |
|\ \ \ \ \ \ | |||||
| * | | | | | | gitweb: Handle invalid regexp in regexp search | Jakub Narebski | 2012-02-28 | 2 | -1/+20 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'nd/maint-verify-objects' into maint | Junio C Hamano | 2012-03-05 | 2 | -25/+18 |
|\ \ \ \ \ \ | |||||
| * | | | | | | rev-list: fix --verify-objects --quiet becoming --objects | Nguyễn Thái Ngọc Duy | 2012-02-28 | 2 | -13/+17 |
| * | | | | | | rev-list: remove BISECT_SHOW_TRIED flag | Nguyễn Thái Ngọc Duy | 2012-02-28 | 2 | -12/+1 |
* | | | | | | | Merge branch 'jk/maint-avoid-streaming-filtered-contents' into maint | Junio C Hamano | 2012-03-05 | 4 | -9/+125 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | do not stream large files to pack when filters are in use | Jeff King | 2012-02-24 | 2 | -5/+95 |
| * | | | | | | | teach dry-run convert_to_git not to require a src buffer | Jeff King | 2012-02-24 | 1 | -2/+10 |
| * | | | | | | | teach convert_to_git a "dry run" mode | Jeff King | 2012-02-24 | 2 | -2/+20 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'jb/filter-ignore-sigpipe' into maint | Junio C Hamano | 2012-03-05 | 1 | -0/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Ignore SIGPIPE when running a filter driver | Jehan Bing | 2012-02-21 | 1 | -0/+5 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'sp/smart-http-failure-to-push' into maint | Junio C Hamano | 2012-03-05 | 1 | -3/+10 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | disconnect from remote helpers more gently | Jeff King | 2012-02-23 | 1 | -3/+10 |
* | | | | | | | | Merge branch 'tr/maint-bundle-long-subject' into maint | Junio C Hamano | 2012-03-05 | 5 | -51/+67 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t5704: match tests to modern style | Thomas Rast | 2012-02-23 | 1 | -25/+8 |
| * | | | | | | | | strbuf: improve strbuf_get*line documentation | Thomas Rast | 2012-02-23 | 1 | -1/+17 |
| * | | | | | | | | bundle: use a strbuf to scan the log for boundary commits | Thomas Rast | 2012-02-23 | 2 | -7/+24 |
| * | | | | | | | | bundle: put strbuf_readline_fd in strbuf.c with adjustments | Thomas Rast | 2012-02-23 | 3 | -19/+19 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | http.proxy: also mention https_proxy and all_proxy | Clemens Buchacher | 2012-03-05 | 1 | -3/+4 |
* | | | | | | | | t0300: work around bug in dash 0.5.6 | Michael J Gruber | 2012-03-03 | 1 | -1/+4 |
* | | | | | | | | t5512 (ls-remote): modernize style | Tom Grennan | 2012-03-03 | 1 | -23/+4 |
* | | | | | | | | tests: fix spurious error when run directly with Solaris /usr/xpg4/bin/sh | Stefano Lattarini | 2012-03-02 | 1 | -4/+5 |
* | | | | | | | | Documentation: do not assume that n > 1 in <rev>~$n | Junio C Hamano | 2012-03-02 | 1 | -1/+1 |
* | | | | | | | | Documentation fixes in git-config | Libor Pechacek | 2012-03-01 | 2 | -7/+12 |
* | | | | | | | | Update draft release notes to 1.7.9.3 | Junio C Hamano | 2012-02-28 | 1 | -0/+7 |
* | | | | | | | | Merge branch 'pj/remote-set-branches-usage-fix' into maint | Junio C Hamano | 2012-02-28 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | remote: fix set-branches usage and documentation | Philip Jägenstedt | 2012-02-20 | 2 | -2/+2 |
* | | | | | | | | | Merge branch 'jn/gitweb-unborn-head' into maint | Junio C Hamano | 2012-02-28 | 2 | -2/+11 |
|\ \ \ \ \ \ \ \ \ |