Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'uk/maint-shortlog-encoding' | Junio C Hamano | 2009-11-30 | 2 | -8/+39 |
|\ | |||||
| * | shortlog: respect commit encoding | Uwe Kleine-König | 2009-11-26 | 2 | -9/+39 |
* | | Merge branch 'ns/send-email-no-chain-reply-to' | Junio C Hamano | 2009-11-30 | 2 | -2/+66 |
|\ \ | |||||
| * | | prepare send-email for smoother change of --chain-reply-to default | Nanako Shiraishi | 2009-11-29 | 2 | -2/+66 |
* | | | Merge branch 'jc/maint-am-keep' | Junio C Hamano | 2009-11-30 | 1 | -5/+6 |
|\ \ \ | |||||
| * | | | Remove dead code from "git am" | Junio C Hamano | 2009-11-28 | 1 | -5/+6 |
* | | | | Merge branch 'bw/diff-color-hunk-header' | Junio C Hamano | 2009-11-30 | 5 | -19/+63 |
|\ \ \ \ | |||||
| * | | | | Give the hunk comment its own color | Bert Wesarg | 2009-11-28 | 5 | -9/+52 |
| * | | | | emit_line(): don't emit an empty <SET><RESET> followed by a newline | Junio C Hamano | 2009-11-28 | 2 | -10/+11 |
* | | | | | t/README: Document GIT_TEST_INSTALLED and GIT_TEST_EXEC_PATH | Matthew Ogilvie | 2009-11-30 | 1 | -0/+13 |
* | | | | | t3409 t4107 t7406 t9150: use dashless commands | Matthew Ogilvie | 2009-11-30 | 4 | -16/+16 |
* | | | | | t2300: use documented technique to invoke git-sh-setup | Matthew Ogilvie | 2009-11-30 | 1 | -1/+1 |
| |_|/ / |/| | | | |||||
* | | | | Update draft release notes to 1.6.6 before merging topics for -rc1 | Junio C Hamano | 2009-11-28 | 1 | -33/+100 |
* | | | | Makefile: do not clean arm directory | Jonathan Nieder | 2009-11-28 | 1 | -1/+1 |
* | | | | Merge branch 'maint' | Junio C Hamano | 2009-11-27 | 2 | -2/+20 |
|\ \ \ \ | |||||
| * | | | | builtin-apply.c: pay attention to -p<n> when determining the name | Junio C Hamano | 2009-11-27 | 2 | -2/+20 |
* | | | | | Add a notice that only certain functions can print color escape codes | Johannes Sixt | 2009-11-27 | 1 | -0/+5 |
| |/ / / |/| | | | |||||
* | | | | gitworkflows: Consistently back-quote git commands | Björn Gustavsson | 2009-11-27 | 1 | -1/+1 |
* | | | | Merge branch 'rs/work-around-grep-opt-insanity' | Junio C Hamano | 2009-11-25 | 9 | -25/+32 |
|\ \ \ \ | |||||
| * | | | | Protect scripted Porcelains from GREP_OPTIONS insanity | Junio C Hamano | 2009-11-24 | 8 | -18/+26 |
| * | | | | mergetool--lib: simplify guess_merge_tool() | René Scharfe | 2009-11-24 | 1 | -7/+6 |
| | |_|/ | |/| | | |||||
* | | | | Explicitly truncate bswap operand to uint32_t | Benjamin Kramer | 2009-11-25 | 1 | -1/+1 |
* | | | | t1200: fix a timing dependent error | Nanako Shiraishi | 2009-11-25 | 2 | -5/+9 |
* | | | | Merge branch 'rj/maint-cygwin-count-objects' | Junio C Hamano | 2009-11-25 | 1 | -0/+1 |
|\ \ \ \ | |||||
| * | | | | git-count-objects: Fix a disk-space under-estimate on Cygwin | Ramsay Jones | 2009-11-20 | 1 | -0/+1 |
| |/ / / | |||||
* | | | | Documentation: update descriptions of revision options related to '--bisect' | Christian Couder | 2009-11-24 | 1 | -12/+27 |
* | | | | Enable support for IPv6 on MinGW | Martin Storsjö | 2009-11-24 | 3 | -2/+181 |
* | | | | Refactor winsock initialization into a separate function | Martin Storsjö | 2009-11-24 | 1 | -3/+12 |
* | | | | Merge branch 'rs/color-escape-has-zero-width' | Junio C Hamano | 2009-11-24 | 2 | -4/+22 |
|\ \ \ \ | |||||
| * | | | | strbuf_add_wrapped_text(): skip over colour codes | René Scharfe | 2009-11-24 | 2 | -4/+22 |
* | | | | | Merge branch 'bg/apply-doc' | Junio C Hamano | 2009-11-24 | 2 | -21/+39 |
|\ \ \ \ \ | |||||
| * | | | | | Fix over-simplified documentation for 'git log -z' | Björn Gustavsson | 2009-11-23 | 1 | -5/+7 |
| * | | | | | apply: Use the term "working tree" consistently | Björn Gustavsson | 2009-11-22 | 1 | -2/+2 |
| * | | | | | apply: Format all options using back-quotes | Björn Gustavsson | 2009-11-22 | 1 | -8/+8 |
| * | | | | | apply: apply works outside a repository | Björn Gustavsson | 2009-11-22 | 1 | -3/+6 |
| * | | | | | Clarify and correct -z | Björn Gustavsson | 2009-11-22 | 2 | -8/+21 |
* | | | | | | Merge branch 'mm/maint-hint-failed-merge' | Junio C Hamano | 2009-11-24 | 5 | -3/+32 |
|\ \ \ \ \ \ | |||||
| * | | | | | | user-manual: Document that "git merge" doesn't like uncommited changes. | Matthieu Moy | 2009-11-23 | 1 | -2/+18 |
| * | | | | | | merge-recursive: point the user to commit when file would be overwritten. | Matthieu Moy | 2009-11-23 | 4 | -1/+14 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'jc/log-stdin' | Junio C Hamano | 2009-11-24 | 8 | -34/+164 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add trivial tests for --stdin option to log family | Junio C Hamano | 2009-11-23 | 1 | -0/+61 |
| * | | | | | | Make --stdin option to "log" family read also pathspecs | Junio C Hamano | 2009-11-21 | 2 | -5/+71 |
| * | | | | | | setup_revisions(): do not call get_pathspec() too early | Junio C Hamano | 2009-11-21 | 1 | -3/+6 |
| * | | | | | | Teach --stdin option to "log" family | Junio C Hamano | 2009-11-21 | 7 | -22/+20 |
| * | | | | | | read_revision_from_stdin(): use strbuf | Junio C Hamano | 2009-11-20 | 1 | -8/+10 |
* | | | | | | | Merge branch 'mr/gitweb-snapshot' | Junio C Hamano | 2009-11-24 | 4 | -19/+234 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t/gitweb-lib: Split HTTP response with non-GNU sed | Brian Gernhardt | 2009-11-24 | 1 | -2/+12 |
| * | | | | | | | gitweb: Smarter snapshot names | Mark Rada | 2009-11-09 | 2 | -21/+93 |
| * | | | | | | | gitweb: Document current snapshot rules via new tests | Jakub Narebski | 2009-11-09 | 1 | -0/+87 |
| * | | | | | | | t/gitweb-lib.sh: Split gitweb output into headers and body | Jakub Narebski | 2009-10-31 | 1 | -1/+5 |