summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* teach "git branch" a --quiet optionjk/branch-quietJeff King2012-03-262-6/+15
* checkout: suppress tracking message with "-q"Jeff King2012-03-264-6/+8
* Git 1.7.9.5v1.7.9.5Junio C Hamano2012-03-264-3/+27
* Merge branch 'jn/maint-fast-import-empty-ls' into maintJunio C Hamano2012-03-262-0/+43
|\
| * fast-import: don't allow 'ls' of path with empty componentsjn/maint-fast-import-empty-lsJonathan Nieder2012-03-092-0/+41
| * fast-import: leakfix for 'ls' of dirty treesJonathan Nieder2012-03-091-0/+2
* | Merge branch 'ph/rerere-doc' into maintJunio C Hamano2012-03-261-7/+12
|\ \
| * | rerere: Document 'rerere remaining'ph/rerere-docPhil Hord2012-03-081-7/+12
* | | Merge branch 'ms/maint-config-error-at-eol-linecount' into maintJunio C Hamano2012-03-262-4/+40
|\ \ \
| * | | config: report errors at the EOL with correct line numberms/maint-config-error-at-eol-linecountMartin Stenberg2012-03-122-4/+40
* | | | grep doc: add --break / --heading / -W to synopsisMark Lodato2012-03-261-0/+2
* | | | Documentation: improve description of GIT_EDITOR and preference orderRodrigo Silva (MestreLion)2012-03-261-0/+6
* | | | documentation: fix alphabetic ordered list for git-rebase man pageNelson Benitez Leon2012-03-261-2/+5
* | | | Merge branch 'maint-1.7.8' into maintJunio C Hamano2012-03-205-16/+34
|\ \ \ \
| * \ \ \ Merge branch 'ks/sort-wildcard-in-makefile' into maint-1.7.8Junio C Hamano2012-03-201-3/+3
| |\ \ \ \
| | * | | | t/Makefile: Use $(sort ...) explicitly where neededks/sort-wildcard-in-makefileKirill Smelkov2012-01-221-3/+3
| * | | | | Merge branch 'jc/advise-i18n' into maint-1.7.8Junio C Hamano2012-03-202-12/+20
| |\ \ \ \ \
| | * | | | | i18n of multi-line advice messagesjc/advise-i18nJunio C Hamano2011-12-222-12/+20
| * | | | | | Merge branch 'jn/gitweb-unspecified-action' into maint-1.7.8Junio C Hamano2012-03-202-1/+11
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | gitweb: Fix actionless dispatch for non-existent objectsjn/gitweb-unspecified-actionJakub Narebski2012-01-092-1/+11
* | | | | | | Git 1.7.9.4v1.7.9.4Junio C Hamano2012-03-124-3/+28
* | | | | | | Merge branch 'tr/maint-bundle-boundary' into maintJunio C Hamano2012-03-122-23/+36
|\ \ \ \ \ \ \
| * | | | | | | bundle: keep around names passed to add_pending_object()tr/maint-bundle-boundaryThomas Rast2012-03-012-1/+16
| * | | | | | | t5510: ensure we stay in the toplevel test dirThomas Rast2012-03-011-8/+10
| * | | | | | | t5510: refactor bundle->pack conversionThomas Rast2012-03-011-14/+10
* | | | | | | | Merge branch 'jc/maint-diff-patch-header' into maintJunio C Hamano2012-03-122-86/+111
|\ \ \ \ \ \ \ \
| * | | | | | | | diff -p: squelch "diff --git" header for stat-dirty pathsjc/maint-diff-patch-headerJunio C Hamano2012-03-012-5/+2
| * | | | | | | | t4011: illustrate "diff-index -p" on stat-dirty pathsJunio C Hamano2012-03-011-7/+39
| * | | | | | | | t4011: modernise styleJunio C Hamano2012-03-011-86/+82
* | | | | | | | | Merge branch 'jn/maint-do-not-match-with-unsanitized-searchtext' into maintJunio C Hamano2012-03-121-8/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | gitweb: Fix fixed string (non-regexp) project searchjn/maint-do-not-match-with-unsanitized-searchtextJakub Narebski2012-03-061-8/+8
* | | | | | | | | | Merge branch 'jc/am-3-nonstandard-popt' into maintJunio C Hamano2012-03-122-4/+22
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | test: "am -3" can accept non-standard -p<num>jc/am-3-nonstandard-poptJunio C Hamano2012-02-261-0/+15
| * | | | | | | | | | am -3: allow nonstandard -p<num> optionJunio C Hamano2012-02-221-4/+7
* | | | | | | | | | | t5704: fix nonportable sed/grep usagesThomas Rast2012-03-061-2/+2
* | | | | | | | | | | Merge branch 'maint-1.7.8' into maintJunio C Hamano2012-03-061-0/+3
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'maint-1.7.7' into maint-1.7.8Junio C Hamano2012-03-061-0/+3
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
| | * | | | | | | | | Document the --histogram diff optionThomas Rast2012-03-061-0/+3
* | | | | | | | | | | Git 1.7.9.3v1.7.9.3Junio C Hamano2012-03-052-2/+3
* | | | | | | | | | | Merge branch 'jc/doc-merge-options' into maintJunio C Hamano2012-03-051-11/+11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Documentation/merge-options.txt: group "ff" related options togetherjc/doc-merge-optionsJunio C Hamano2012-02-221-11/+11
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'cn/maint-rev-list-doc' into maintJunio C Hamano2012-03-051-6/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Documentation: use {asterisk} in rev-list-options.txt when neededcn/maint-rev-list-docCarlos Martín Nieto2012-02-281-6/+6
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | fast-import: zero all of 'struct tag' to silence valgrindThomas Rast2012-03-051-1/+1
* | | | | | | | | | | Update draft release notes to 1.7.9.3 for the last timeJunio C Hamano2012-03-041-0/+27
* | | | | | | | | | | Merge branch 'cn/maint-branch-with-bad' into maintJunio C Hamano2012-03-042-0/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | branch: don't assume the merge filter ref existscn/maint-branch-with-badCarlos Martín Nieto2012-02-272-0/+8
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'jn/maint-gitweb-invalid-regexp' into maintJunio C Hamano2012-03-042-1/+20
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | gitweb: Handle invalid regexp in regexp searchjn/maint-gitweb-invalid-regexpJakub Narebski2012-02-282-1/+20
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'nd/maint-verify-objects' into maintJunio C Hamano2012-03-042-25/+18
|\ \ \ \ \ \ \ \ \ \ \