Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jn/notes-doc' | Junio C Hamano | 2010-06-13 | 4 | -35/+238 |
|\ | |||||
| * | Documentation/notes: nitpicks | Jonathan Nieder | 2010-05-08 | 1 | -6/+6 |
| * | Documentation/notes: clean up description of rewriting configuration | Jonathan Nieder | 2010-05-08 | 1 | -18/+29 |
| * | Documentation/notes: simplify treatment of default display refs | Jonathan Nieder | 2010-05-08 | 1 | -17/+19 |
| * | Documentation/log: add a CONFIGURATION section | Jonathan Nieder | 2010-05-08 | 1 | -0/+42 |
| * | Documentation/notes: simplify treatment of default notes ref | Jonathan Nieder | 2010-05-08 | 1 | -11/+20 |
| * | Documentation/notes: add configuration section | Jonathan Nieder | 2010-05-08 | 1 | -0/+59 |
| * | Documentation/notes: describe content of notes blobs | Jonathan Nieder | 2010-05-08 | 2 | -1/+75 |
| * | Documentation/notes: document format of notes trees | Jonathan Nieder | 2010-05-08 | 2 | -20/+26 |
* | | Merge branch 'wp/pretty-enhancement' | Junio C Hamano | 2010-06-13 | 4 | -24/+221 |
|\ \ | |||||
| * | | pretty: initialize new cmt_fmt_map to 0 | Jonathan Nieder | 2010-05-08 | 1 | -0/+1 |
| * | | pretty: add aliases for pretty formats | Will Palmer | 2010-05-03 | 4 | -3/+145 |
| * | | pretty: add infrastructure for commit format aliases | Will Palmer | 2010-05-03 | 1 | -3/+24 |
| * | | pretty: make it easier to add new formats | Will Palmer | 2010-05-03 | 1 | -24/+57 |
| |/ | |||||
* | | Merge branch 'ab/test-cleanup' | Junio C Hamano | 2010-06-13 | 5 | -5/+7 |
|\ \ | |||||
| * | | Turn setup code in t2007-checkout-symlink.sh into a test | Ævar Arnfjörð Bjarmason | 2010-05-07 | 1 | -2/+4 |
| * | | Move t6000lib.sh to lib-* | Ævar Arnfjörð Bjarmason | 2010-05-07 | 4 | -3/+3 |
* | | | Merge branch 'jn/maint-amend-missing-name' | Junio C Hamano | 2010-06-13 | 2 | -7/+59 |
|\ \ \ | |||||
| * | | | commit --amend: cope with missing display name | Jonathan Nieder | 2010-05-04 | 2 | -7/+59 |
| |/ / | |||||
* | | | Merge branch 'rs/diff-no-minimal' | Junio C Hamano | 2010-06-13 | 7 | -11/+11 |
|\ \ \ | |||||
| * | | | git diff too slow for a file | René Scharfe | 2010-05-02 | 7 | -11/+11 |
* | | | | Merge branch 'maint' | Junio C Hamano | 2010-06-13 | 2 | -6/+6 |
|\ \ \ \ | |||||
| * | | | | add-interactive: Clarify “remaining hunks in the file” | Jonathan Nieder | 2010-06-13 | 2 | -6/+6 |
* | | | | | gitweb: Fix typo in hash key name in %opts in git_header_html | Jakub Narebski | 2010-06-13 | 1 | -1/+1 |
* | | | | | Merge branch 'maint' | Junio C Hamano | 2010-06-11 | 1 | -0/+6 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | t/README: document --root option | Thomas Rast | 2010-06-11 | 1 | -0/+6 |
| * | | | | Makefile: default pager on AIX to "more" | Jeff King | 2010-06-11 | 1 | -0/+1 |
* | | | | | merge-recursive: demonstrate an incorrect conflict with submodule | Johannes Sixt | 2010-06-11 | 1 | -0/+29 |
* | | | | | Makefile: default pager on AIX to "more" | Jeff King | 2010-06-10 | 1 | -0/+1 |
* | | | | | Merge branch 'maint' | Junio C Hamano | 2010-06-07 | 3 | -4/+4 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Change C99 comments to old-style C comments | Tor Arntsen | 2010-06-07 | 3 | -4/+4 |
* | | | | | Merge branch 'maint' | Junio C Hamano | 2010-06-07 | 1 | -4/+5 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | commit.txt: clarify how --author argument is used | Jay Soffian | 2010-06-06 | 1 | -4/+5 |
* | | | | | Merge branch 'maint' | Junio C Hamano | 2010-06-06 | 1 | -0/+6 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | setup: document prefix | Clemens Buchacher | 2010-06-05 | 1 | -0/+6 |
* | | | | | git svn: fix empty directory creation | Michael J. Kiwala | 2010-06-03 | 1 | -1/+2 |
* | | | | | Merge branch 'maint' | Junio C Hamano | 2010-06-02 | 5 | -5/+14 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | git-compat-util.h: use apparently more common __sgi macro to detect SGI IRIX | Gary V. Vaughan | 2010-06-02 | 1 | -1/+1 |
| * | | | | Documentation: A...B shortcut for checkout and rebase | Michael J Gruber | 2010-06-02 | 2 | -0/+8 |
| * | | | | Documentation/pretty-{formats,options}: better reference for "format:<string>" | Nazri Ramliy | 2010-06-02 | 2 | -4/+5 |
* | | | | | Merge branch 'maint' | Junio C Hamano | 2010-05-31 | 2 | -1/+8 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | 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/SubmittingPatches: Fix typo in GMail section | Tim Henigan | 2010-05-31 | 1 | -1/+1 |
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-05-28 | 4 | -6/+21 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge branch 'maint-1.7.0' into maint | Junio C Hamano | 2010-05-28 | 1 | -2/+3 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Makefile: reenable install with NO_CURL | Michael J Gruber | 2010-05-28 | 1 | -2/+3 |
| * | | | | | completion: --set-upstream option for git-branch | Michael J Gruber | 2010-05-28 | 1 | -0/+1 |
| * | | | | | get_cwd_relative(): do not misinterpret suffix as subdirectory | Clemens Buchacher | 2010-05-28 | 2 | -4/+17 |
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-05-25 | 4 | -25/+26 |
|\ \ \ \ \ \ | |/ / / / / |