Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jn/gitweb-blame' | Junio C Hamano | 2009-12-01 | 6 | -88/+1173 |
|\ | |||||
| * | gitweb: Add link to other blame implementation in blame views | Jakub Narebski | 2009-12-01 | 1 | -0/+11 |
| * | gitweb: Make linking to actions requiring JavaScript a feature | Jakub Narebski | 2009-11-30 | 1 | -1/+8 |
| * | gitweb.js: fix padLeftStr() and its usage | Stephen Boyd | 2009-11-25 | 1 | -5/+5 |
| * | gitweb.js: Harden setting blamed commit info in incremental blame | Jakub Narebski | 2009-11-25 | 1 | -1/+6 |
| * | gitweb.js: fix null object exception in initials calculation | Stephen Boyd | 2009-11-19 | 1 | -2/+5 |
| * | gitweb: Minify gitweb.js if JSMIN is defined | Jakub Narebski | 2009-09-01 | 1 | -0/+20 |
| * | gitweb: Create links leading to 'blame_incremental' using JavaScript | Jakub Narebski | 2009-09-01 | 2 | -9/+53 |
| * | gitweb: Colorize 'blame_incremental' view during processing | Jakub Narebski | 2009-09-01 | 2 | -3/+110 |
| * | gitweb: Incremental blame (using JavaScript) | Jakub Narebski | 2009-09-01 | 6 | -88/+940 |
| * | gitweb: Add optional "time to generate page" info in footer | Jakub Narebski | 2009-09-01 | 2 | -0/+36 |
* | | Merge branch 'fc/maint-format-patch-pathspec-dashes' | Junio C Hamano | 2009-11-30 | 2 | -1/+7 |
|\ \ | |||||
| * | | format-patch: add test for parsing of "--" | Felipe Contreras | 2009-11-26 | 1 | -0/+5 |
| * | | format-patch: fix parsing of "--" on the command line | Felipe Contreras | 2009-11-26 | 1 | -1/+2 |
* | | | Merge branch 'mm/maint-merge-ff-error-message-fix' | Junio C Hamano | 2009-11-30 | 3 | -18/+27 |
|\ \ \ | |||||
| * | | | builtin-merge: show user-friendly error messages for fast-forward too. | Matthieu Moy | 2009-11-29 | 1 | -0/+1 |
| * | | | merge-recursive: make the error-message generation an extern function | Matthieu Moy | 2009-11-29 | 2 | -13/+21 |
| |/ / | |||||
* | | | Merge branch 'ap/maint-merge-strategy-list-fix' | Junio C Hamano | 2009-11-30 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | builtin-merge.c: call exclude_cmds() correctly. | Avery Pennarun | 2009-11-29 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge branch 'jc/pretty-lf' | Junio C Hamano | 2009-11-30 | 3 | -2/+70 |
|\ \ \ | |||||
| * | | | Pretty-format: %[+-]x to tweak inter-item newlines | Junio C Hamano | 2009-10-04 | 3 | -2/+70 |
* | | | | Merge branch 'cc/bisect-doc' | Junio C Hamano | 2009-11-30 | 3 | -0/+1364 |
|\ \ \ \ | |||||
| * | | | | Documentation: add "Fighting regressions with git bisect" article | Christian Couder | 2009-11-08 | 3 | -0/+1364 |
* | | | | | Merge branch 'em/commit-claim' | Junio C Hamano | 2009-11-30 | 3 | -4/+129 |
|\ \ \ \ \ | |||||
| * | | | | | commit -c/-C/--amend: reset timestamp and authorship to committer with --rese... | Erick Mattos | 2009-11-04 | 3 | -4/+129 |
* | | | | | | Merge branch 'jc/mailinfo-remove-brackets' | Junio C Hamano | 2009-11-30 | 2 | -21/+35 |
|\ \ \ \ \ \ | |||||
| * | | | | | | mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker | Junio C Hamano | 2009-07-29 | 2 | -21/+35 |
* | | | | | | | Merge branch 'fc/send-email-envelope' | Junio C Hamano | 2009-11-30 | 3 | -4/+41 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | send-email: automatic envelope sender | Felipe Contreras | 2009-11-27 | 3 | -4/+24 |
| * | | | | | | | t9001: test --envelope-sender option of send-email | Junio C Hamano | 2009-11-22 | 1 | -0/+17 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | 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-25 | 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-27 | 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-27 | 2 | -10/+11 |
* | | | | | | | | | | t/README: Document GIT_TEST_INSTALLED and GIT_TEST_EXEC_PATH | Matthew Ogilvie | 2009-11-29 | 1 | -0/+13 |
* | | | | | | | | | | t3409 t4107 t7406 t9150: use dashless commands | Matthew Ogilvie | 2009-11-29 | 4 | -16/+16 |
* | | | | | | | | | | t2300: use documented technique to invoke git-sh-setup | Matthew Ogilvie | 2009-11-29 | 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-26 | 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-26 | 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-23 | 8 | -18/+26 |