summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jn/notes-doc'Junio C Hamano2010-06-134-35/+238
|\
| * Documentation/notes: nitpicksJonathan Nieder2010-05-081-6/+6
| * Documentation/notes: clean up description of rewriting configurationJonathan Nieder2010-05-081-18/+29
| * Documentation/notes: simplify treatment of default display refsJonathan Nieder2010-05-081-17/+19
| * Documentation/log: add a CONFIGURATION sectionJonathan Nieder2010-05-081-0/+42
| * Documentation/notes: simplify treatment of default notes refJonathan Nieder2010-05-081-11/+20
| * Documentation/notes: add configuration sectionJonathan Nieder2010-05-081-0/+59
| * Documentation/notes: describe content of notes blobsJonathan Nieder2010-05-082-1/+75
| * Documentation/notes: document format of notes treesJonathan Nieder2010-05-082-20/+26
* | Merge branch 'wp/pretty-enhancement'Junio C Hamano2010-06-134-24/+221
|\ \
| * | pretty: initialize new cmt_fmt_map to 0Jonathan Nieder2010-05-081-0/+1
| * | pretty: add aliases for pretty formatsWill Palmer2010-05-034-3/+145
| * | pretty: add infrastructure for commit format aliasesWill Palmer2010-05-031-3/+24
| * | pretty: make it easier to add new formatsWill Palmer2010-05-031-24/+57
| |/
* | Merge branch 'ab/test-cleanup'Junio C Hamano2010-06-135-5/+7
|\ \
| * | Turn setup code in t2007-checkout-symlink.sh into a testÆvar Arnfjörð Bjarmason2010-05-071-2/+4
| * | Move t6000lib.sh to lib-*Ævar Arnfjörð Bjarmason2010-05-074-3/+3
* | | Merge branch 'jn/maint-amend-missing-name'Junio C Hamano2010-06-132-7/+59
|\ \ \
| * | | commit --amend: cope with missing display nameJonathan Nieder2010-05-042-7/+59
| |/ /
* | | Merge branch 'rs/diff-no-minimal'Junio C Hamano2010-06-137-11/+11
|\ \ \
| * | | git diff too slow for a fileRené Scharfe2010-05-027-11/+11
* | | | Merge branch 'maint'Junio C Hamano2010-06-132-6/+6
|\ \ \ \
| * | | | add-interactive: Clarify “remaining hunks in the file”Jonathan Nieder2010-06-132-6/+6
* | | | | gitweb: Fix typo in hash key name in %opts in git_header_htmlJakub Narebski2010-06-131-1/+1
* | | | | Merge branch 'maint'Junio C Hamano2010-06-111-0/+6
|\ \ \ \ \ | |/ / / /
| * | | | t/README: document --root optionThomas Rast2010-06-111-0/+6
| * | | | Makefile: default pager on AIX to "more"Jeff King2010-06-111-0/+1
* | | | | merge-recursive: demonstrate an incorrect conflict with submoduleJohannes Sixt2010-06-111-0/+29
* | | | | Makefile: default pager on AIX to "more"Jeff King2010-06-101-0/+1
* | | | | Merge branch 'maint'Junio C Hamano2010-06-073-4/+4
|\ \ \ \ \ | |/ / / /
| * | | | Change C99 comments to old-style C commentsTor Arntsen2010-06-073-4/+4
* | | | | Merge branch 'maint'Junio C Hamano2010-06-071-4/+5
|\ \ \ \ \ | |/ / / /
| * | | | commit.txt: clarify how --author argument is usedJay Soffian2010-06-061-4/+5
* | | | | Merge branch 'maint'Junio C Hamano2010-06-061-0/+6
|\ \ \ \ \ | |/ / / /
| * | | | setup: document prefixClemens Buchacher2010-06-051-0/+6
* | | | | git svn: fix empty directory creationMichael J. Kiwala2010-06-031-1/+2
* | | | | Merge branch 'maint'Junio C Hamano2010-06-025-5/+14
|\ \ \ \ \ | |/ / / /
| * | | | git-compat-util.h: use apparently more common __sgi macro to detect SGI IRIXGary V. Vaughan2010-06-021-1/+1
| * | | | Documentation: A...B shortcut for checkout and rebaseMichael J Gruber2010-06-022-0/+8
| * | | | Documentation/pretty-{formats,options}: better reference for "format:<string>"Nazri Ramliy2010-06-022-4/+5
* | | | | Merge branch 'maint'Junio C Hamano2010-05-312-1/+8
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'maint-1.7.0' into maintJunio C Hamano2010-05-311-0/+7
| |\ \ \ \
| | * | | | Documentation/config: describe status.submodulesummaryMichael J Gruber2010-05-281-0/+7
| * | | | | Documentation/SubmittingPatches: Fix typo in GMail sectionTim Henigan2010-05-311-1/+1
* | | | | | Merge branch 'maint'Junio C Hamano2010-05-284-6/+21
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'maint-1.7.0' into maintJunio C Hamano2010-05-281-2/+3
| |\ \ \ \ \ | | |/ / / /
| | * | | | Makefile: reenable install with NO_CURLMichael J Gruber2010-05-281-2/+3
| * | | | | completion: --set-upstream option for git-branchMichael J Gruber2010-05-281-0/+1
| * | | | | get_cwd_relative(): do not misinterpret suffix as subdirectoryClemens Buchacher2010-05-282-4/+17
* | | | | | Merge branch 'maint'Junio C Hamano2010-05-254-25/+26
|\ \ \ \ \ \ | |/ / / / /