Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'rs/grep-color' | Junio C Hamano | 2011-06-29 |
|\ | |||
| * | grep: add --heading | René Scharfe | 2011-06-05 |
| * | grep: add --break | René Scharfe | 2011-06-05 |
| * | grep: fix coloring of hunk marks between files | René Scharfe | 2011-06-05 |
* | | Merge branch 'jc/maint-1.7.3-checkout-describe' | Junio C Hamano | 2011-06-29 |
|\ \ | |||
| * | | checkout -b <name>: correctly detect existing branch | Junio C Hamano | 2011-06-05 |
* | | | Merge branch 'jk/maint-1.7.2-status-ignored' | Junio C Hamano | 2011-06-29 |
|\ \ \ | |||
| * | | | git status --ignored: tests and docs | Junio C Hamano | 2011-06-02 |
* | | | | Merge branch 'mg/diff-stat-count' | Junio C Hamano | 2011-06-29 |
|\ \ \ \ | |||
| * | | | | diff --stat-count: finishing touches | Junio C Hamano | 2011-05-27 |
* | | | | | Merge branch 'jk/combine-diff-binary-etc' | Junio C Hamano | 2011-06-29 |
|\ \ \ \ \ | |||
| * | | | | | combine-diff: respect textconv attributes | Jeff King | 2011-05-24 |
| * | | | | | combine-diff: handle binary files as binary | Jeff King | 2011-05-23 |
* | | | | | | Merge git://bogomips.org/git-svn into maint | Junio C Hamano | 2011-06-29 |
|\ \ \ \ \ \ | |||
| * | | | | | | git-svn: Correctly handle root commits in mergeinfo ranges | Michael Haggerty | 2011-06-28 |
| * | | | | | | git-svn: Demonstrate a bug with root commits in mergeinfo ranges | Michael Haggerty | 2011-06-28 |
* | | | | | | | Merge branch 'maint-1.7.5' into maint | Junio C Hamano | 2011-06-29 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||
| * | | | | | | test: skip clean-up when running under --immediate mode | Junio C Hamano | 2011-06-29 |
| * | | | | | | Merge branch 'jk/maint-config-alias-fix' into maint | Junio C Hamano | 2011-06-01 |
| |\ \ \ \ \ \ | |||
| * \ \ \ \ \ \ | Merge branch 'ml/test-readme' into maint | Junio C Hamano | 2011-05-31 |
| |\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ | Merge branch 'ab/i18n-fixup' into maint | Junio C Hamano | 2011-05-31 |
| |\ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ | Merge branch 'jc/rename-degrade-cc-to-c' into maint | Junio C Hamano | 2011-05-31 |
| |\ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jn/run-command-error-failure' into maint | Junio C Hamano | 2011-05-29 |
| |\ \ \ \ \ \ \ \ \ \ | |||
* | \ \ \ \ \ \ \ \ \ \ | Merge branch 'mk/grep-pcre' | Junio C Hamano | 2011-06-20 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | t7810: avoid unportable use of "echo" | Junio C Hamano | 2011-06-20 |
* | | | | | | | | | | | | | Merge branch 'di/no-no-existant' | Junio C Hamano | 2011-06-19 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | Fix typo: existant->existent | Dmitry Ivankov | 2011-06-16 |
* | | | | | | | | | | | | | | tests: link shell libraries into valgrind directory | Jeff King | 2011-06-17 |
* | | | | | | | | | | | | | | t/Makefile: pass test opts to valgrind target properly | Jeff King | 2011-06-17 |
|/ / / / / / / / / / / / / | |||
* | | | | | | | | | | | | | gitweb: do not misparse nonnumeric content tag files that contain a digit | Jonathan Nieder | 2011-06-09 |
* | | | | | | | | | | | | | Merge branch 'jc/magic-pathspec' | Junio C Hamano | 2011-06-07 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | t3703: skip more tests using colons in file names on Windows | Alex Riesen | 2011-06-07 |
* | | | | | | | | | | | | | | Merge branch 'jk/diff-not-so-quick' | Junio C Hamano | 2011-06-06 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | diff_tree: disable QUICK optimization with diff filter | Jeff King | 2011-05-31 |
* | | | | | | | | | | | | | | | Merge branch 'bc/maint-status-z-to-use-porcelain' | Junio C Hamano | 2011-06-06 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | builtin/commit.c: set status_format _after_ option parsing | Brandon Casey | 2011-05-29 |
| * | | | | | | | | | | | | | | t7508: demonstrate status's failure to use --porcelain format with -z | Brandon Casey | 2011-05-29 |
* | | | | | | | | | | | | | | | Merge branch 'jk/format-patch-am' | Junio C Hamano | 2011-05-31 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | format-patch: preserve subject newlines with -k | Jeff King | 2011-05-26 |
| * | | | | | | | | | | | | | | | mailinfo: always clean up rfc822 header folding | Jeff King | 2011-05-26 |
| * | | | | | | | | | | | | | | | t: test subject handling in format-patch / am pipeline | Jeff King | 2011-05-26 |
* | | | | | | | | | | | | | | | | Merge branch 'jk/format-patch-empty-prefix' | Junio C Hamano | 2011-05-31 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | format-patch: make zero-length subject prefixes prettier | Jeff King | 2011-05-30 |
* | | | | | | | | | | | | | | | | | Merge branch 'jk/rebase-head-reflog' | Junio C Hamano | 2011-05-31 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | rebase: write a reflog entry when finishing | Jeff King | 2011-05-27 |
* | | | | | | | | | | | | | | | | | | Merge branch 'jk/maint-remote-mirror-safer' | Junio C Hamano | 2011-05-31 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | | remote: allow "-t" with fetch mirrors | Jeff King | 2011-05-26 |
* | | | | | | | | | | | | | | | | | | | Merge branch 'jl/read-tree-m-dry-run' | Junio C Hamano | 2011-05-31 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | | | Teach read-tree the -n|--dry-run option | Jens Lehmann | 2011-05-25 |
* | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/maint-config-alias-fix' | Junio C Hamano | 2011-05-30 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | / / / / / | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | |