| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'jc/fix-diff-files-unmerged' | Junio C Hamano | 2011-05-06 | 13 | -22/+102 |
|\ |
|
| * | diff-files: show unmerged entries correctly | Junio C Hamano | 2011-04-23 | 1 | -0/+87 |
| * | test: use $_z40 from test-lib | Junio C Hamano | 2011-04-23 | 12 | -22/+15 |
* | | Merge branch 'js/blame-parsename' | Junio C Hamano | 2011-05-06 | 2 | -2/+13 |
|\ \ |
|
| * | | t/annotate-tests: Use echo & cat instead of sed | Brian Gernhardt | 2011-05-05 | 1 | -1/+2 |
| * | | blame: tolerate bogus e-mail addresses a bit better | Josh Stone | 2011-04-29 | 2 | -2/+12 |
* | | | Merge branch 'jk/format-patch-quote-special-in-from' | Junio C Hamano | 2011-05-06 | 1 | -0/+43 |
|\ \ \ |
|
| * | | | pretty: quote rfc822 specials in email addresses | Jeff King | 2011-04-26 | 1 | -0/+42 |
* | | | | Merge branch 'nd/struct-pathspec' | Junio C Hamano | 2011-05-06 | 1 | -0/+22 |
|\ \ \ \ |
|
| * | | | | Convert read_tree{,_recursive} to support struct pathspec | Nguyễn Thái Ngọc Duy | 2011-03-25 | 1 | -0/+22 |
* | | | | | Merge branch 'aw/maint-rebase-i-p-no-ff' | Junio C Hamano | 2011-05-06 | 1 | -1/+31 |
|\ \ \ \ \ |
|
| * | | | | | git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff | Andrew Wong | 2011-04-28 | 1 | -1/+31 |
| | |/ / /
| |/| | | |
|
* | | | | | Merge branch 'mg/alias-expose-prefix' | Junio C Hamano | 2011-05-06 | 1 | -0/+21 |
|\ \ \ \ \ |
|
| * | | | | | handle_alias: provide GIT_PREFIX to !alias | Michael J Gruber | 2011-04-27 | 1 | -0/+10 |
| * | | | | | t1020: test !alias in subdirectory | Michael J Gruber | 2011-04-27 | 1 | -0/+11 |
| | |_|/ /
| |/| | | |
|
* | | | | | Merge branch 'maint' | Junio C Hamano | 2011-05-05 | 1 | -3/+2 |
|\ \ \ \ \ |
|
| * | | | | | t3701: fix here document | Junio C Hamano | 2011-05-05 | 1 | -3/+2 |
| * | | | | | Merge branch 'jh/dirstat' into maint | Junio C Hamano | 2011-05-04 | 6 | -7/+40 |
| |\ \ \ \ \ |
|
| * \ \ \ \ \ | Merge branch 'jk/maint-stash-oob' into maint | Junio C Hamano | 2011-05-04 | 1 | -5/+11 |
| |\ \ \ \ \ \ |
|
| * \ \ \ \ \ \ | Merge branch 'dm/stash-k-i-p' into maint | Junio C Hamano | 2011-05-04 | 2 | -0/+20 |
| |\ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ | Merge branch 'mg/reflog-with-options' into maint | Junio C Hamano | 2011-05-04 | 1 | -0/+18 |
| |\ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ | Merge branch 'jk/stash-loosen-safety' into maint | Junio C Hamano | 2011-05-04 | 1 | -4/+16 |
| |\ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ \ | Merge branch 'ar/clean-rmdir-empty' into maint | Junio C Hamano | 2011-05-04 | 1 | -0/+7 |
| |\ \ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'mg/sha1-path-advise' into maint | Junio C Hamano | 2011-05-04 | 1 | -5/+12 |
| |\ \ \ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mg/x-years-12-months' into maint | Junio C Hamano | 2011-04-29 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|_|/ / / /
| |/| | | | | | | | | | | |
|
* | | | | | | | | | | | | | Merge branch 'ml/test-readme' | Junio C Hamano | 2011-05-04 | 1 | -8/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | t/README: unify documentation of test function args | Mathias Lafeldt | 2011-04-26 | 1 | -8/+9 |
| |/ / / / / / / / / / / / |
|
* | | | | | | | | | | | | | Merge branch 'mg/rev-list-count-cherry' | Junio C Hamano | 2011-05-04 | 1 | -0/+27 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | rev-list --count: separate count for --cherry-mark | Michael J Gruber | 2011-04-26 | 1 | -0/+27 |
| |/ / / / / / / / / / / / |
|
* | | | | | | | | | | | | | Merge branch 'jk/format-patch-multiline-header' | Junio C Hamano | 2011-05-04 | 1 | -0/+15 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | format-patch: wrap email addresses after long names | Jeff King | 2011-04-14 | 1 | -0/+15 |
* | | | | | | | | | | | | | | Merge branch 'jm/mergetool-submodules' | Junio C Hamano | 2011-05-04 | 1 | -3/+287 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | mergetool: Teach about submodules | Jonathon Mah | 2011-04-13 | 1 | -3/+287 |
* | | | | | | | | | | | | | | | Merge branch 'jk/notes-ui-updates' | Junio C Hamano | 2011-05-02 | 1 | -0/+38 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | revision.c: make --no-notes reset --notes list | Jeff King | 2011-03-29 | 1 | -0/+16 |
| * | | | | | | | | | | | | | | | revision.c: support --notes command-line option | Jeff King | 2011-03-29 | 1 | -0/+22 |
* | | | | | | | | | | | | | | | | Merge branch 'ab/i18n-fixup' | Junio C Hamano | 2011-05-02 | 36 | -363/+343 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811 | Junio C Hamano | 2011-04-14 | 4 | -19/+10 |
| * | | | | | | | | | | | | | | | | i18n: use test_i18n{grep,cmp} in t7508 | Junio C Hamano | 2011-04-14 | 1 | -120/+102 |
| * | | | | | | | | | | | | | | | | i18n: use test_i18ngrep in t7506 | Junio C Hamano | 2011-04-14 | 1 | -28/+28 |
| * | | | | | | | | | | | | | | | | i18n: use test_i18ngrep and test_i18ncmp in t7502 | Junio C Hamano | 2011-04-13 | 1 | -41/+31 |
| * | | | | | | | | | | | | | | | | i18n: use test_i18ngrep in t7501 | Junio C Hamano | 2011-04-13 | 1 | -3/+4 |
| * | | | | | | | | | | | | | | | | i18n: use test_i18ncmp in t7500 | Junio C Hamano | 2011-04-13 | 1 | -5/+5 |
| * | | | | | | | | | | | | | | | | i18n: use test_i18ngrep in t7201 | Junio C Hamano | 2011-04-13 | 1 | -7/+7 |
| * | | | | | | | | | | | | | | | | i18n: use test_i18ncmp and test_i18ngrep in t7102 and t7110 | Junio C Hamano | 2011-04-13 | 2 | -8/+8 |
| * | | | | | | | | | | | | | | | | i18n: use test_i18ncmp and test_i18ngrep in t5541, t6040, t6120, t7004, t7012... | Junio C Hamano | 2011-04-13 | 6 | -17/+15 |
| * | | | | | | | | | | | | | | | | i18n: use test_i18ncmp and test_i18ngrep in t3700, t4001 and t4014 | Junio C Hamano | 2011-04-13 | 3 | -13/+13 |
| * | | | | | | | | | | | | | | | | i18n: use test_i18ncmp and test_i18ngrep in t3203, t3501 and t3507 | Junio C Hamano | 2011-04-13 | 3 | -6/+6 |
| * | | | | | | | | | | | | | | | | i18n: use test_i18ngrep in t2020, t2204, t3030, and t3200 | Junio C Hamano | 2011-04-13 | 4 | -19/+21 |
| * | | | | | | | | | | | | | | | | i18n: use test_i18ngrep in lib-httpd and t2019 | Junio C Hamano | 2011-04-13 | 2 | -9/+8 |