summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'cc/bisect' (early part)Junio C Hamano2009-05-311-12/+1
|\
| * bisect: check ancestors without forking a "git rev-list" processChristian Couder2009-05-171-12/+1
* | git-add: no need for -f when resolving a conflict in already tracked pathJeff King2009-05-311-0/+12
* | Merge git://git.bogomips.org/git-svnJunio C Hamano2009-05-301-0/+47
|\ \
| * | git-svn: refuse to dcommit non-UTF-8 messagesEric Wong2009-05-281-0/+47
* | | Merge branch 'sb/maint-1.6.2-opt-filename-fix'Junio C Hamano2009-05-293-0/+84
|\ \ \
| * | | apply, fmt-merge-msg: use relative filenamesStephen Boyd2009-05-232-0/+74
| * | | commit: -F overrides -tStephen Boyd2009-05-231-0/+10
* | | | Merge branch 'jc/maint-add-p-coalesce-fix'Junio C Hamano2009-05-291-0/+38
|\ \ \ \
| * | | | t3701: ensure correctly set up repository after skipped testsJohannes Sixt2009-05-251-0/+6
| * | | | Revert "git-add--interactive: remove hunk coalescing"Junio C Hamano2009-05-161-1/+1
| * | | | Splitting a hunk that adds a line at the top fails in "add -p"Matt Graham2009-05-161-0/+32
* | | | | Merge branch 'rs/maint-grep-word-regexp-fix'Junio C Hamano2009-05-291-1/+8
|\ \ \ \ \
| * | | | | grep: fix word-regexp at the beginning of linesRené Scharfe2009-05-231-1/+8
* | | | | | t9120: don't expect failure with SVN_HTTPD_PORT unsetStephen Boyd2009-05-291-11/+6
* | | | | | Merge branch 'maint'Junio C Hamano2009-05-281-0/+10
|\ \ \ \ \ \
| * | | | | | fix segfault showing an empty remoteClemens Buchacher2009-05-271-0/+10
| * | | | | | Merge branch 'jm/format-patch-no-auto-n-when-k-is-given' into maintJunio C Hamano2009-05-251-0/+7
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'do/maint-merge-recursive-fix' into maintJunio C Hamano2009-05-251-0/+95
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
* | | | | | | | t5500: Modernize test styleStephen Boyd2009-05-271-127/+149
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | t/t3400-rebase.sh: add more tests to help migrating git-rebase.sh to CNguyễn Thái Ngọc Duy2009-05-241-0/+31
* | | | | | | Merge branch 'mg/track'Junio C Hamano2009-05-231-0/+14
|\ \ \ \ \ \ \
| * | | | | | | Fix behavior with non-commit upstream referencesMichael J Gruber2009-05-141-1/+1
| * | | | | | | Test tracking of non-commit upstreamsMichael J Gruber2009-05-131-0/+14
* | | | | | | | Merge branch 'fc/decorate-tag'Junio C Hamano2009-05-231-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Prettify log decorations even moreFelipe Contreras2009-05-131-3/+3
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'jm/format-patch-no-auto-n-when-k-is-given'Junio C Hamano2009-05-231-0/+7
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | format-patch let -k override a config-specified format.numberedJim Meyering2009-05-091-0/+7
| |/ / / / / /
* | | | | | | Merge branch 'do/maint-merge-recursive-fix'Junio C Hamano2009-05-231-0/+95
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | merge-recursive: never leave index unmerged while recursingDave Olszewski2009-05-091-0/+95
* | | | | | | Merge branch 'rs/grep-parseopt'Junio C Hamano2009-05-231-2/+54
|\ \ \ \ \ \ \
| * | | | | | | parseopt: add PARSE_OPT_NODASHRené Scharfe2009-05-091-0/+7
| * | | | | | | parseopt: add OPT_NUMBER_CALLBACKRené Scharfe2009-05-091-0/+18
| * | | | | | | parseopt: add OPT_NEGBITRené Scharfe2009-05-091-2/+29
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'fl/git-pm'Junio C Hamano2009-05-232-8/+19
|\ \ \ \ \ \ \
| * | | | | | | Git.pm: Always set Repository to absolute path if autodetectingFrank Lichtenheld2009-05-091-8/+2
| * | | | | | | Git.pm: Set GIT_WORK_TREE if we set GIT_DIRFrank Lichtenheld2009-05-092-0/+17
| |/ / / / / /
* | | | | | | Merge branch 'mt/submodule-reference'Junio C Hamano2009-05-231-0/+81
|\ \ \ \ \ \ \
| * | | | | | | Add --reference option to git submodule.Michael S. Tsirkin2009-05-091-0/+81
| |/ / / / / /
* | | | | | | git-svn: add --authors-prog optionMark Lodato2009-05-211-0/+69
* | | | | | | git-svn testsuite: use standard configuration for Subversion toolsEygene Ryabinkin2009-05-2129-206/+221
* | | | | | | Merge branch 'js/add-edit'Junio C Hamano2009-05-181-0/+121
|\ \ \ \ \ \ \
| * | | | | | | t3702: fix reliance on SHELL_PATH being '/bin/sh'Johannes Schindelin2009-04-271-7/+19
| * | | | | | | git-add: introduce --edit (to edit the diff vs. the index)Johannes Schindelin2009-04-121-0/+109
* | | | | | | | Merge branch 'ac/graph-horizontal-line'Junio C Hamano2009-05-181-4/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | graph API: Use horizontal lines for more compact graphsAllan Caffee2009-04-221-4/+2
* | | | | | | | | Merge branch 'maint'Junio C Hamano2009-05-163-0/+25
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | test: checkout shouldn't say that HEAD has moved if it didn'tNanako Shiraishi2009-05-161-0/+8
| * | | | | | | | tests: Add tests for missing format-patch long optionsStephen Boyd2009-05-162-0/+17
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Use UTF-8 instead of utf8 for backward compatibilityAlex Riesen2009-05-161-2/+2