Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'ef/maint-win-verify-path' | Junio C Hamano | 2011-06-29 | 5 | -17/+27 |
|\ | |||||
| * | verify_dotfile(): do not assume '/' is the path seperator | Theo Niessink | 2011-06-08 | 1 | -3/+4 |
| * | verify_path(): simplify check at the directory boundary | Junio C Hamano | 2011-06-07 | 1 | -10/+3 |
| * | verify_path: consider dos drive prefix | Erik Faye-Lund | 2011-05-27 | 1 | -1/+4 |
| * | real_path: do not assume '/' is the path seperator | Theo Niessink | 2011-05-27 | 3 | -2/+15 |
| * | A Windows path starting with a backslash is absolute | Theo Niessink | 2011-05-27 | 1 | -1/+1 |
* | | Merge branch 'js/i18n-windows' | Junio C Hamano | 2011-06-29 | 2 | -15/+33 |
|\ \ | |||||
| * | | Windows: teach getenv to do a case-sensitive search | Johannes Sixt | 2011-06-06 | 1 | -3/+20 |
| * | | mingw.c: move definition of mingw_getenv down | Johannes Sixt | 2011-06-06 | 1 | -15/+15 |
| * | | sh-i18n--envsubst: do not crash when no arguments are given | Johannes Sixt | 2011-06-06 | 1 | -0/+1 |
* | | | Merge branch 'rs/grep-color' | Junio C Hamano | 2011-06-29 | 5 | -13/+146 |
|\ \ \ | |||||
| * | | | grep: add --heading | René Scharfe | 2011-06-05 | 5 | -1/+49 |
| * | | | grep: add --break | René Scharfe | 2011-06-05 | 5 | -3/+40 |
| * | | | grep: fix coloring of hunk marks between files | René Scharfe | 2011-06-05 | 3 | -10/+58 |
* | | | | Merge branch 'jc/maint-1.7.3-checkout-describe' | Junio C Hamano | 2011-06-29 | 4 | -1/+19 |
|\ \ \ \ | |||||
| * | | | | checkout -b <name>: correctly detect existing branch | Junio C Hamano | 2011-06-05 | 4 | -1/+19 |
* | | | | | Merge branch 'db/http-cookies' | Junio C Hamano | 2011-06-29 | 2 | -0/+13 |
|\ \ \ \ \ | |||||
| * | | | | | http: pass http.cookiefile using CURLOPT_COOKIEFILE | Duncan Brown | 2011-06-03 | 2 | -0/+13 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'jk/maint-1.7.2-status-ignored' | Junio C Hamano | 2011-06-29 | 3 | -2/+128 |
|\ \ \ \ \ | |||||
| * | | | | | git status --ignored: tests and docs | Junio C Hamano | 2011-06-02 | 2 | -0/+127 |
| * | | | | | status: fix bug with missing --ignore files | Jeff King | 2011-06-02 | 1 | -1/+1 |
* | | | | | | Merge branch 'jc/diff-index-quick-exit-early' | Junio C Hamano | 2011-06-29 | 3 | -2/+10 |
|\ \ \ \ \ \ | |||||
| * | | | | | | diff-index --quiet: learn the "stop feeding the backend early" logic | Junio C Hamano | 2011-05-31 | 3 | -2/+10 |
| * | | | | | | Merge remote-tracking branch 'ko/maint' into jc/diff-index-quick-exit-early | Junio C Hamano | 2011-05-31 | 1452 | -35445/+144356 |
| |\ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ | Merge branch 'mg/diff-stat-count' | Junio C Hamano | 2011-06-29 | 4 | -10/+78 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | diff --stat-count: finishing touches | Junio C Hamano | 2011-05-27 | 2 | -2/+29 |
| * | | | | | | | | diff-options.txt: describe --stat-{width,name-width,count} | Michael J Gruber | 2011-05-27 | 1 | -0/+3 |
| * | | | | | | | | diff: introduce --stat-lines to limit the stat lines | Michael J Gruber | 2011-05-27 | 3 | -5/+39 |
| * | | | | | | | | diff.c: omit hidden entries from namelen calculation with --stat | Michael J Gruber | 2011-05-27 | 1 | -5/+9 |
* | | | | | | | | | Merge branch 'jc/advice-about-to-lose-commit' | Junio C Hamano | 2011-06-29 | 1 | -10/+11 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | checkout: make advice when reattaching the HEAD less loud | Junio C Hamano | 2011-05-24 | 1 | -6/+9 |
* | | | | | | | | | | Merge branch 'jk/combine-diff-binary-etc' | Junio C Hamano | 2011-06-29 | 5 | -83/+376 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | combine-diff: respect textconv attributes | Jeff King | 2011-05-24 | 2 | -9/+131 |
| * | | | | | | | | | | refactor get_textconv to not require diff_filespec | Jeff King | 2011-05-23 | 3 | -13/+20 |
| * | | | | | | | | | | combine-diff: handle binary files as binary | Jeff King | 2011-05-23 | 2 | -2/+148 |
| * | | | | | | | | | | combine-diff: calculate mode_differs earlier | Jeff King | 2011-05-23 | 1 | -2/+7 |
| * | | | | | | | | | | combine-diff: split header printing into its own function | Jeff King | 2011-05-23 | 1 | -61/+74 |
* | | | | | | | | | | | Merge branch 'instaweb' of git://bogomips.org/git-svn | Junio C Hamano | 2011-06-29 | 2 | -34/+58 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | git-instaweb: Check that correct config file exists for (re)start | Jakub Narebski | 2011-06-27 | 2 | -4/+11 |
| * | | | | | | | | | | | git-instaweb: Move all actions at the end of script | Jakub Narebski | 2011-06-27 | 1 | -7/+20 |
| * | | | | | | | | | | | git-instaweb: Use $conf, not $fqgitdir/gitweb/httpd.conf | Jakub Narebski | 2011-06-27 | 1 | -2/+2 |
| * | | | | | | | | | | | git-instaweb: Extract configuring web server into configure_httpd | Jakub Narebski | 2011-06-27 | 1 | -21/+25 |
* | | | | | | | | | | | | Merge git://bogomips.org/git-svn into maint | Junio C Hamano | 2011-06-29 | 2 | -4/+41 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | git-svn: Correctly handle root commits in mergeinfo ranges | Michael Haggerty | 2011-06-28 | 2 | -3/+7 |
| * | | | | | | | | | | | | git-svn: Disambiguate rev-list arguments to improve error message | Michael Haggerty | 2011-06-28 | 1 | -2/+2 |
| * | | | | | | | | | | | | git-svn: Demonstrate a bug with root commits in mergeinfo ranges | Michael Haggerty | 2011-06-28 | 1 | -0/+33 |
| |/ / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge branch 'maint-1.7.5' into maint | Junio C Hamano | 2011-06-29 | 2 | -3/+11 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | test: skip clean-up when running under --immediate mode | Junio C Hamano | 2011-06-29 | 1 | -2/+10 |
| * | | | | | | | | | | | "branch -d" can remove more than one branches | Junio C Hamano | 2011-06-29 | 1 | -1/+1 |
* | | | | | | | | | | | | Git 1.7.6v1.7.6 | Junio C Hamano | 2011-06-26 | 3 | -8/+7 |