Commit message (Expand) | Author | Age | |
---|---|---|---|
* | git-sh-i18n--envsubst: our own envsubst(1) for eval_gettext() | Ævar Arnfjörð Bjarmason | 2011-05-14 |
* | Merge branch 'jn/run-command-error-failure' | Junio C Hamano | 2011-05-06 |
|\ | |||
| * | tests: check error message from run_command | Jonathan Nieder | 2011-04-20 |
* | | Merge branch 'jk/merge-one-file-working-tree' | Junio C Hamano | 2011-05-06 |
|\ \ | |||
| * | | merge-one-file: fix broken merges with alternate work trees | Jeff King | 2011-04-29 |
| * | | add tests for merge-index / merge-one-file | Jeff King | 2011-04-29 |
* | | | Merge branch 'jc/fix-diff-files-unmerged' | Junio C Hamano | 2011-05-06 |
|\ \ \ | |||
| * | | | diff-files: show unmerged entries correctly | Junio C Hamano | 2011-04-23 |
| * | | | test: use $_z40 from test-lib | Junio C Hamano | 2011-04-23 |
* | | | | Merge branch 'js/blame-parsename' | Junio C Hamano | 2011-05-06 |
|\ \ \ \ | |||
| * | | | | t/annotate-tests: Use echo & cat instead of sed | Brian Gernhardt | 2011-05-05 |
| * | | | | blame: tolerate bogus e-mail addresses a bit better | Josh Stone | 2011-04-29 |
| | |_|/ | |/| | | |||
* | | | | Merge branch 'jk/format-patch-quote-special-in-from' | Junio C Hamano | 2011-05-06 |
|\ \ \ \ | |||
| * | | | | pretty: quote rfc822 specials in email addresses | Jeff King | 2011-04-26 |
* | | | | | Merge branch 'nd/struct-pathspec' | Junio C Hamano | 2011-05-06 |
|\ \ \ \ \ | |||
| * | | | | | Convert read_tree{,_recursive} to support struct pathspec | Nguyễn Thái Ngọc Duy | 2011-03-25 |
* | | | | | | Merge branch 'aw/maint-rebase-i-p-no-ff' | Junio C Hamano | 2011-05-06 |
|\ \ \ \ \ \ | |||
| * | | | | | | git-rebase--interactive.sh: preserve-merges fails on merges created with no-ff | Andrew Wong | 2011-04-28 |
| | |/ / / / | |/| | | | | |||
* | | | | | | Merge branch 'mg/alias-expose-prefix' | Junio C Hamano | 2011-05-06 |
|\ \ \ \ \ \ | |||
| * | | | | | | handle_alias: provide GIT_PREFIX to !alias | Michael J Gruber | 2011-04-27 |
| * | | | | | | t1020: test !alias in subdirectory | Michael J Gruber | 2011-04-27 |
| | |_|/ / / | |/| | | | | |||
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2011-05-05 |
|\ \ \ \ \ \ | |||
| * | | | | | | t3701: fix here document | Junio C Hamano | 2011-05-05 |
| * | | | | | | Merge branch 'jh/dirstat' into maint | Junio C Hamano | 2011-05-04 |
| |\ \ \ \ \ \ | |||
| * \ \ \ \ \ \ | Merge branch 'jk/maint-stash-oob' into maint | Junio C Hamano | 2011-05-04 |
| |\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ | Merge branch 'dm/stash-k-i-p' into maint | Junio C Hamano | 2011-05-04 |
| |\ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ | Merge branch 'mg/reflog-with-options' into maint | Junio C Hamano | 2011-05-04 |
| |\ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'jk/stash-loosen-safety' into maint | Junio C Hamano | 2011-05-04 |
| |\ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'ar/clean-rmdir-empty' into maint | Junio C Hamano | 2011-05-04 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mg/sha1-path-advise' into maint | Junio C Hamano | 2011-05-04 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'mg/x-years-12-months' into maint | Junio C Hamano | 2011-04-29 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | Merge branch 'ml/test-readme' | Junio C Hamano | 2011-05-04 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | t/README: unify documentation of test function args | Mathias Lafeldt | 2011-04-26 |
| |/ / / / / / / / / / / / / | |||
* | | | | | | | | | | | | | | Merge branch 'mg/rev-list-count-cherry' | Junio C Hamano | 2011-05-04 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | rev-list --count: separate count for --cherry-mark | Michael J Gruber | 2011-04-26 |
| |/ / / / / / / / / / / / / | |||
* | | | | | | | | | | | | | | Merge branch 'jk/format-patch-multiline-header' | Junio C Hamano | 2011-05-04 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | format-patch: wrap email addresses after long names | Jeff King | 2011-04-14 |
* | | | | | | | | | | | | | | | Merge branch 'jm/mergetool-submodules' | Junio C Hamano | 2011-05-04 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | mergetool: Teach about submodules | Jonathon Mah | 2011-04-13 |
* | | | | | | | | | | | | | | | | Merge branch 'jk/notes-ui-updates' | Junio C Hamano | 2011-05-02 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | revision.c: make --no-notes reset --notes list | Jeff King | 2011-03-29 |
| * | | | | | | | | | | | | | | | | revision.c: support --notes command-line option | Jeff King | 2011-03-29 |
* | | | | | | | | | | | | | | | | | Merge branch 'ab/i18n-fixup' | Junio C Hamano | 2011-05-02 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811 | Junio C Hamano | 2011-04-14 |
| * | | | | | | | | | | | | | | | | | i18n: use test_i18n{grep,cmp} in t7508 | Junio C Hamano | 2011-04-14 |
| * | | | | | | | | | | | | | | | | | i18n: use test_i18ngrep in t7506 | Junio C Hamano | 2011-04-14 |
| * | | | | | | | | | | | | | | | | | i18n: use test_i18ngrep and test_i18ncmp in t7502 | Junio C Hamano | 2011-04-13 |
| * | | | | | | | | | | | | | | | | | i18n: use test_i18ngrep in t7501 | Junio C Hamano | 2011-04-13 |
| * | | | | | | | | | | | | | | | | | i18n: use test_i18ncmp in t7500 | Junio C Hamano | 2011-04-13 |
| * | | | | | | | | | | | | | | | | | i18n: use test_i18ngrep in t7201 | Junio C Hamano | 2011-04-13 |