Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jn/notes-doc' into maint | Junio C Hamano | 2010-06-21 | 1 | -11/+5 |
|\ | |||||
| * | Documentation/notes: document format of notes trees | Jonathan Nieder | 2010-05-08 | 1 | -11/+5 |
* | | Merge branch 'bg/send-email-smtpdomain' into maint | Junio C Hamano | 2010-06-16 | 1 | -0/+1 |
|\ \ | |||||
| * | | send-email: Cleanup smtp-domain and add config | Brian Gernhardt | 2010-04-10 | 1 | -0/+1 |
* | | | Merge branch 'maint-1.7.0' into maint | Junio C Hamano | 2010-05-31 | 1 | -0/+7 |
|\ \ \ | |||||
| * | | | Documentation/config: describe status.submodulesummary | Michael J Gruber | 2010-05-28 | 1 | -0/+7 |
* | | | | Documentation: fix minor inconsistency | Michael J Gruber | 2010-05-18 | 1 | -1/+1 |
* | | | | Documentation/config.txt: GIT_NOTES_REWRITE_REF overrides notes.rewriteRef | Leif Arne Storset | 2010-05-07 | 1 | -4/+4 |
| |_|/ |/| | | |||||
* | | | Merge branch 'wp/doc-filter-direction' | Junio C Hamano | 2010-04-18 | 1 | -4/+4 |
|\ \ \ | |/ / | |||||
| * | | documentation: clarify direction of core.autocrlf | Will Palmer | 2010-04-17 | 1 | -4/+4 |
* | | | Merge branch 'maint' | Junio C Hamano | 2010-04-13 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Documentation/config.txt: default gc.aggressiveWindow is 250, not 10 | Jay Soffian | 2010-04-13 | 1 | -1/+1 |
* | | | Merge branch 'tr/notes-display' | Junio C Hamano | 2010-03-24 | 1 | -2/+51 |
|\ \ \ | |||||
| * | | | notes: implement helpers needed for note copying during rewrite | Thomas Rast | 2010-03-12 | 1 | -0/+30 |
| * | | | Support showing notes from more than one notes tree | Thomas Rast | 2010-03-12 | 1 | -2/+21 |
* | | | | Merge branch 'ml/color-grep' | Junio C Hamano | 2010-03-20 | 1 | -3/+23 |
|\ \ \ \ | |||||
| * | | | | grep: Colorize selected, context, and function lines | Mark Lodato | 2010-03-08 | 1 | -0/+6 |
| * | | | | grep: Colorize filename, line number, and separator | Mark Lodato | 2010-03-08 | 1 | -3/+17 |
* | | | | | Merge branch 'maint' | Junio C Hamano | 2010-03-17 | 1 | -1/+1 |
|\ \ \ \ \ | | |_|/ / | |/| | / | |_|_|/ |/| | | | |||||
| * | | | Documentation: receive.denyCurrentBranch defaults to 'refuse' | Thomas Rast | 2010-03-17 | 1 | -1/+1 |
| * | | | Merge branch 'jc/checkout-detached' into maint | Junio C Hamano | 2010-03-08 | 1 | -0/+5 |
| |\ \ \ | |||||
* | \ \ \ | Merge branch 'sd/init-template' | Junio C Hamano | 2010-03-10 | 1 | -0/+4 |
|\ \ \ \ \ | |||||
| * | | | | | Add a "TEMPLATE DIRECTORY" section to git-init[1]. | Steven Drake | 2010-02-17 | 1 | -0/+4 |
* | | | | | | Merge branch 'sh/am-keep-cr' | Junio C Hamano | 2010-03-10 | 1 | -0/+7 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | git-am: Add am.keepcr and --no-keep-cr to override it | Stefan-W. Hahn | 2010-02-28 | 1 | -0/+7 |
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-02-28 | 1 | -3/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | | | |||||
| * | | | | Remove reference to GREP_COLORS from documentation | Mark Lodato | 2010-02-28 | 1 | -3/+1 |
| |/ / / | |||||
* | | | | Merge branch 'jc/checkout-detached' | Junio C Hamano | 2010-02-21 | 1 | -0/+5 |
|\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| * | | Reword "detached HEAD" notification | Junio C Hamano | 2010-01-29 | 1 | -0/+5 |
* | | | make --max-pack-size argument to 'git pack-object' count in bytes | Nicolas Pitre | 2010-02-03 | 1 | -4/+7 |
* | | | Merge branch 'sp/maint-fast-import-large-blob' into sp/fast-import-large-blob | Junio C Hamano | 2010-02-01 | 1 | -0/+14 |
|\ \ \ | |/ / |/| | | |||||
| * | | fast-import: Stream very large blobs directly to pack | Shawn O. Pearce | 2010-02-01 | 1 | -0/+14 |
* | | | Documentation: add missing :: in config.txt | Thomas Rast | 2010-01-24 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Merge remote branch 'remotes/trast-doc/for-next' | Junio C Hamano | 2010-01-20 | 1 | -39/+39 |
|\ \ | |||||
| * | | Documentation: spell 'git cmd' without dash throughout | Thomas Rast | 2010-01-10 | 1 | -36/+36 |
| * | | Documentation: format full commands in typewriter font | Thomas Rast | 2010-01-10 | 1 | -6/+6 |
* | | | Merge branch 'jc/grep-lookahead' | Junio C Hamano | 2010-01-20 | 1 | -8/+0 |
|\ \ \ | |||||
| * | | | grep: rip out support for external grep | Junio C Hamano | 2010-01-13 | 1 | -8/+0 |
* | | | | Merge branch 'mm/conflict-advice' | Junio C Hamano | 2010-01-20 | 1 | -0/+4 |
|\ \ \ \ | |||||
| * | | | | Be more user-friendly when refusing to do something because of conflict. | Matthieu Moy | 2010-01-12 | 1 | -0/+4 |
| |/ / / | |||||
* | | | | Merge branch 'jk/warn-author-committer-after-commit' | Junio C Hamano | 2010-01-20 | 1 | -0/+4 |
|\ \ \ \ | |||||
| * | | | | commit: allow suppression of implicit identity advice | Jeff King | 2010-01-14 | 1 | -0/+4 |
| |/ / / | |||||
* | | | | Merge branch 'jh/commit-status' | Junio C Hamano | 2010-01-17 | 1 | -0/+5 |
|\ \ \ \ | |||||
| * | | | | commit: support commit.status, --status, and --no-status | James P. Howard, II | 2010-01-13 | 1 | -0/+5 |
| |/ / / | |||||
* | | | | Merge branch 'nd/sparse' | Junio C Hamano | 2010-01-13 | 1 | -0/+4 |
|\ \ \ \ | |||||
| * | | | | unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout | Nguyễn Thái Ngọc Duy | 2009-08-23 | 1 | -0/+4 |
* | | | | | Merge branch 'tr/http-updates' | Junio C Hamano | 2010-01-10 | 1 | -0/+6 |
|\ \ \ \ \ | |||||
| * | | | | | Remove http.authAny | Junio C Hamano | 2009-12-29 | 1 | -7/+0 |
| * | | | | | Add an option for using any HTTP authentication scheme, not only basic | Martin Storsjö | 2009-11-27 | 1 | -0/+7 |
| * | | | | | http: maintain curl sessions | Tay Ray Chuan | 2009-11-27 | 1 | -0/+6 |