summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ef/maint-win-verify-path'Junio C Hamano2011-06-295-17/+27
|\
| * verify_dotfile(): do not assume '/' is the path seperatorTheo Niessink2011-06-081-3/+4
| * verify_path(): simplify check at the directory boundaryJunio C Hamano2011-06-071-10/+3
| * verify_path: consider dos drive prefixErik Faye-Lund2011-05-271-1/+4
| * real_path: do not assume '/' is the path seperatorTheo Niessink2011-05-273-2/+15
| * A Windows path starting with a backslash is absoluteTheo Niessink2011-05-271-1/+1
* | Merge branch 'js/i18n-windows'Junio C Hamano2011-06-292-15/+33
|\ \
| * | Windows: teach getenv to do a case-sensitive searchJohannes Sixt2011-06-061-3/+20
| * | mingw.c: move definition of mingw_getenv downJohannes Sixt2011-06-061-15/+15
| * | sh-i18n--envsubst: do not crash when no arguments are givenJohannes Sixt2011-06-061-0/+1
* | | Merge branch 'rs/grep-color'Junio C Hamano2011-06-295-13/+146
|\ \ \
| * | | grep: add --headingRené Scharfe2011-06-055-1/+49
| * | | grep: add --breakRené Scharfe2011-06-055-3/+40
| * | | grep: fix coloring of hunk marks between filesRené Scharfe2011-06-053-10/+58
* | | | Merge branch 'jc/maint-1.7.3-checkout-describe'Junio C Hamano2011-06-294-1/+19
|\ \ \ \
| * | | | checkout -b <name>: correctly detect existing branchJunio C Hamano2011-06-054-1/+19
* | | | | Merge branch 'db/http-cookies'Junio C Hamano2011-06-292-0/+13
|\ \ \ \ \
| * | | | | http: pass http.cookiefile using CURLOPT_COOKIEFILEDuncan Brown2011-06-032-0/+13
| | |/ / / | |/| | |
* | | | | Merge branch 'jk/maint-1.7.2-status-ignored'Junio C Hamano2011-06-293-2/+128
|\ \ \ \ \
| * | | | | git status --ignored: tests and docsJunio C Hamano2011-06-022-0/+127
| * | | | | status: fix bug with missing --ignore filesJeff King2011-06-021-1/+1
* | | | | | Merge branch 'jc/diff-index-quick-exit-early'Junio C Hamano2011-06-293-2/+10
|\ \ \ \ \ \
| * | | | | | diff-index --quiet: learn the "stop feeding the backend early" logicJunio C Hamano2011-05-313-2/+10
| * | | | | | Merge remote-tracking branch 'ko/maint' into jc/diff-index-quick-exit-earlyJunio C Hamano2011-05-311452-35445/+144356
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'mg/diff-stat-count'Junio C Hamano2011-06-294-10/+78
|\ \ \ \ \ \ \ \
| * | | | | | | | diff --stat-count: finishing touchesJunio C Hamano2011-05-272-2/+29
| * | | | | | | | diff-options.txt: describe --stat-{width,name-width,count}Michael J Gruber2011-05-271-0/+3
| * | | | | | | | diff: introduce --stat-lines to limit the stat linesMichael J Gruber2011-05-273-5/+39
| * | | | | | | | diff.c: omit hidden entries from namelen calculation with --statMichael J Gruber2011-05-271-5/+9
* | | | | | | | | Merge branch 'jc/advice-about-to-lose-commit'Junio C Hamano2011-06-291-10/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | checkout: make advice when reattaching the HEAD less loudJunio C Hamano2011-05-241-6/+9
* | | | | | | | | | Merge branch 'jk/combine-diff-binary-etc'Junio C Hamano2011-06-295-83/+376
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | combine-diff: respect textconv attributesJeff King2011-05-242-9/+131
| * | | | | | | | | | refactor get_textconv to not require diff_filespecJeff King2011-05-233-13/+20
| * | | | | | | | | | combine-diff: handle binary files as binaryJeff King2011-05-232-2/+148
| * | | | | | | | | | combine-diff: calculate mode_differs earlierJeff King2011-05-231-2/+7
| * | | | | | | | | | combine-diff: split header printing into its own functionJeff King2011-05-231-61/+74
* | | | | | | | | | | Merge branch 'instaweb' of git://bogomips.org/git-svnJunio C Hamano2011-06-292-34/+58
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git-instaweb: Check that correct config file exists for (re)startJakub Narebski2011-06-272-4/+11
| * | | | | | | | | | | git-instaweb: Move all actions at the end of scriptJakub Narebski2011-06-271-7/+20
| * | | | | | | | | | | git-instaweb: Use $conf, not $fqgitdir/gitweb/httpd.confJakub Narebski2011-06-271-2/+2
| * | | | | | | | | | | git-instaweb: Extract configuring web server into configure_httpdJakub Narebski2011-06-271-21/+25
* | | | | | | | | | | | Merge git://bogomips.org/git-svn into maintJunio C Hamano2011-06-292-4/+41
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | git-svn: Correctly handle root commits in mergeinfo rangesMichael Haggerty2011-06-282-3/+7
| * | | | | | | | | | | | git-svn: Disambiguate rev-list arguments to improve error messageMichael Haggerty2011-06-281-2/+2
| * | | | | | | | | | | | git-svn: Demonstrate a bug with root commits in mergeinfo rangesMichael Haggerty2011-06-281-0/+33
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'maint-1.7.5' into maintJunio C Hamano2011-06-292-3/+11
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | test: skip clean-up when running under --immediate modeJunio C Hamano2011-06-291-2/+10
| * | | | | | | | | | | "branch -d" can remove more than one branchesJunio C Hamano2011-06-291-1/+1
* | | | | | | | | | | | Git 1.7.6v1.7.6Junio C Hamano2011-06-263-8/+7