Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update draft release notes to 1.7.10 | Junio C Hamano | 2012-03-16 | 1 | -1/+10 |
* | Merge branch 'th/mergetools-deltawalker' | Junio C Hamano | 2012-03-16 | 1 | -2/+3 |
|\ | |||||
| * | Documentation/difftool: add deltawalker to list of valid diff toolsth/mergetools-deltawalker | Tim Henigan | 2012-03-15 | 1 | -2/+3 |
* | | Merge branch 'th/doc-diff-submodule-option' | Junio C Hamano | 2012-03-15 | 1 | -5/+6 |
|\ \ | |||||
| * | | Documentation/diff-options: reword description of --submodule optionth/doc-diff-submodule-option | Tim Henigan | 2012-03-14 | 1 | -5/+6 |
* | | | Git 1.7.10-rc1v1.7.10-rc1 | Junio C Hamano | 2012-03-14 | 1 | -3/+11 |
* | | | Merge branch 'ph/rerere-doc' | Junio C Hamano | 2012-03-13 | 1 | -7/+12 |
|\ \ \ | |||||
| * | | | rerere: Document 'rerere remaining'ph/rerere-doc | Phil Hord | 2012-03-08 | 1 | -7/+12 |
* | | | | am: officially deprecate -b/--binary option | Junio C Hamano | 2012-03-13 | 1 | -2/+2 |
* | | | | Update draft release notes to 1.7.10 before -rc1 | Junio C Hamano | 2012-03-12 | 1 | -21/+12 |
* | | | | Sync with 1.7.9.4 | Junio C Hamano | 2012-03-12 | 2 | -1/+26 |
|\ \ \ \ | |||||
| * | | | | Git 1.7.9.4v1.7.9.4 | Junio C Hamano | 2012-03-12 | 2 | -1/+26 |
* | | | | | Update draft release notes to 1.7.10 | Junio C Hamano | 2012-03-08 | 1 | -10/+28 |
* | | | | | Merge branch 'vr/branch-doc' | Junio C Hamano | 2012-03-08 | 1 | -9/+10 |
|\ \ \ \ \ | |||||
| * | | | | | Documentation/git-branch: add default for --containsvr/branch-doc | Vincent van Ravesteijn | 2012-03-06 | 1 | -2/+3 |
| * | | | | | Documentation/git-branch: fix a typo | Vincent van Ravesteijn | 2012-03-06 | 1 | -1/+1 |
| * | | | | | Documentation/git-branch: cleanups | Vincent van Ravesteijn | 2012-03-06 | 1 | -6/+6 |
* | | | | | | Git 1.7.10-rc0v1.7.10-rc0 | Junio C Hamano | 2012-03-07 | 1 | -5/+57 |
* | | | | | | Merge branch 'zj/diff-stat-dyncol' | Junio C Hamano | 2012-03-06 | 2 | -6/+16 |
|\ \ \ \ \ \ | |||||
| * | | | | | | diff --stat: add config option to limit graph widthzj/diff-stat-dyncol | Zbigniew Jędrzejewski-Szmek | 2012-03-01 | 2 | -7/+13 |
| * | | | | | | diff --stat: enable limiting of the graph part | Zbigniew Jędrzejewski-Szmek | 2012-03-01 | 1 | -0/+2 |
| * | | | | | | diff --stat: use a maximum of 5/8 for the filename part | Zbigniew Jędrzejewski-Szmek | 2012-03-01 | 1 | -6/+8 |
* | | | | | | | Merge branch 'maint' | Junio C Hamano | 2012-03-06 | 1 | -0/+3 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | 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 |
* | | | | | | | Sync with 1.7.9.3 | Junio C Hamano | 2012-03-05 | 1 | -1/+2 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Git 1.7.9.3v1.7.9.3 | Junio C Hamano | 2012-03-05 | 1 | -1/+2 |
| * | | | | | | Merge branch 'jc/doc-merge-options' into maint | Junio C Hamano | 2012-03-05 | 1 | -11/+11 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'cn/maint-rev-list-doc' into maint | Junio C Hamano | 2012-03-05 | 1 | -6/+6 |
| |\ \ \ \ \ \ \ | |||||
* | | | | | | | | | fsck doc: a minor typofix | Junio C Hamano | 2012-03-05 | 1 | -1/+1 |
* | | | | | | | | | Update draft release notes to 1.7.10 | Junio C Hamano | 2012-03-04 | 1 | -34/+11 |
* | | | | | | | | | Merge branch 'jk/symbolic-ref-short' | Junio C Hamano | 2012-03-04 | 1 | -1/+6 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | symbolic-ref --short: abbreviate the output unambiguouslyjk/symbolic-ref-short | Jan Krüger | 2012-02-27 | 1 | -1/+6 |
* | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2012-03-04 | 2 | -3/+31 |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | / | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
| * | | | | | | | | Update draft release notes to 1.7.9.3 for the last time | Junio C Hamano | 2012-03-04 | 1 | -0/+27 |
| * | | | | | | | | Merge branch 'tr/maint-bundle-long-subject' into maint | Junio C Hamano | 2012-03-04 | 1 | -1/+17 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | http.proxy: also mention https_proxy and all_proxy | Clemens Buchacher | 2012-03-04 | 1 | -3/+4 |
* | | | | | | | | | | Update draft release notes to 1.7.10 | Junio C Hamano | 2012-03-02 | 1 | -12/+21 |
* | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2012-03-02 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Documentation: do not assume that n > 1 in <rev>~$n | Junio C Hamano | 2012-03-02 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'cb/fsck-squelch-dangling' | Junio C Hamano | 2012-03-01 | 3 | -10/+14 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | fsck: --no-dangling omits "dangling object" informationcb/fsck-squelch-dangling | Junio C Hamano | 2012-02-28 | 3 | -10/+14 |
* | | | | | | | | | | | Merge branch 'rs/no-no-no-parseopt' | Junio C Hamano | 2012-03-01 | 2 | -2/+20 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | parse-options: allow positivation of options starting, with no- | René Scharfe | 2012-02-26 | 1 | -1/+2 |
* | | | | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2012-03-01 | 2 | -7/+12 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Documentation fixes in git-config | Libor Pechacek | 2012-03-01 | 2 | -7/+12 |
* | | | | | | | | | | | | Merge branch 'cn/maint-rev-list-doc' | Junio C Hamano | 2012-03-01 | 1 | -6/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Documentation: use {asterisk} in rev-list-options.txt when neededcn/maint-rev-list-doc | Carlos Martín Nieto | 2012-02-28 | 1 | -6/+6 |
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Update draft release notes to 1.7.10 | Junio C Hamano | 2012-02-28 | 1 | -1/+5 |