summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | t4030, t4031: work around bogus MSYS bash path conversionJohannes Sixt2010-01-052-2/+2
| * | | | | | | | | | diff: run external diff helper with shellJeff King2010-01-051-1/+1
| * | | | | | | | | | textconv: use shell to run helperJeff King2010-01-053-2/+3
| * | | | | | | | | | editor: use run_command's shell featureJeff King2010-01-051-19/+2
| * | | | | | | | | | run-command: optimize out useless shell callsJeff King2010-01-051-9/+11
| * | | | | | | | | | run-command: convert simple callsites to use_shellJeff King2010-01-054-12/+10
| * | | | | | | | | | t0021: use $SHELL_PATH for the filter scriptJohannes Sixt2010-01-051-1/+2
| * | | | | | | | | | run-command: add "use shell" optionJeff King2010-01-012-0/+49
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'sr/gfi-options'Junio C Hamano2010-01-173-86/+462
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fast-import: add (non-)relative-marks featureSverre Rabbelier2009-12-053-2/+58
| * | | | | | | | | | fast-import: allow for multiple --import-marks= argumentsSverre Rabbelier2009-12-043-6/+45
| * | | | | | | | | | fast-import: test the new option commandSverre Rabbelier2009-12-041-1/+36
| * | | | | | | | | | fast-import: add option commandSverre Rabbelier2009-12-042-25/+94
| * | | | | | | | | | fast-import: add feature commandSverre Rabbelier2009-12-043-0/+133
| * | | | | | | | | | fast-import: put marks reading in its own functionSverre Rabbelier2009-12-041-42/+51
| * | | | | | | | | | fast-import: put option parsing code in separate functionsSverre Rabbelier2009-12-041-40/+75
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Update COPYING with GPLv2 with new FSF addressJunio C Hamano2010-01-171-13/+12
* | | | | | | | | | Merge branch 'maint'Junio C Hamano2010-01-163-4/+6
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | Fix uninitialized variable in get_refs_via_rsync().Richard Weinberger2010-01-151-1/+1
| * | | | | | | | | Document git-blame triple -C optionRamkumar Ramachandra2010-01-142-3/+5
* | | | | | | | | | Merge branch 'cc/reset-more'Junio C Hamano2010-01-161-10/+10
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | t7111: fix bad HEAD in tests with unmerged entriesChristian Couder2010-01-161-10/+10
* | | | | | | | | | Merge branch 'jc/checkout-merge-base'Junio C Hamano2010-01-137-5/+222
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | rebase -i: teach --onto A...B syntaxNanako Shiraishi2010-01-072-1/+50
| * | | | | | | | | | rebase: fix --onto A...B parsing and add testsNanako Shiraishi2010-01-072-14/+94
| * | | | | | | | | | "rebase --onto A...B" replays history on the merge base between A and BJunio C Hamano2009-11-211-1/+18
| * | | | | | | | | | "checkout A...B" switches to the merge base between A and BJunio C Hamano2009-10-184-3/+74
* | | | | | | | | | | Merge branch 'rs/maint-archive-match-pathspec'Junio C Hamano2010-01-131-1/+24
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | archive: complain about path specs that don't match anythingRené Scharfe2009-12-301-1/+24
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'il/vcs-helper'Junio C Hamano2010-01-137-93/+505
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Reset possible helper before reusing remote structureIlari Liusvaara2010-01-091-0/+3
| * | | | | | | | | | | Remove special casing of http, https and ftpIlari Liusvaara2009-12-283-10/+29
| * | | | | | | | | | | Support remote archive from all smart transportsIlari Liusvaara2009-12-284-7/+55
| * | | | | | | | | | | Support remote helpers implementing smart transportsIlari Liusvaara2009-12-282-7/+142
| * | | | | | | | | | | Support taking over transportsIlari Liusvaara2009-12-093-6/+66
| * | | | | | | | | | | Refactor git transport options parsingIlari Liusvaara2009-12-092-31/+62
| * | | | | | | | | | | Pass unknown protocols to external protocol handlersIlari Liusvaara2009-12-092-16/+72
| * | | | | | | | | | | Support mandatory capabilitiesIlari Liusvaara2009-12-092-7/+23
| * | | | | | | | | | | Add remote helper debug modeIlari Liusvaara2009-12-091-25/+69
| * | | | | | | | | | | Merge branch 'master' into il/vcs-helperJunio C Hamano2009-12-06308-2343/+14152
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cc/reset-more'Junio C Hamano2010-01-137-20/+435
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | t7111: check that reset options work as described in the tablesChristian Couder2010-01-091-0/+113
| * | | | | | | | | | | | Documentation: reset: add some missing tablesChristian Couder2010-01-041-6/+29
| * | | | | | | | | | | | Fix bit assignment for CE_CONFLICTEDJunio C Hamano2010-01-041-1/+1
| * | | | | | | | | | | | "reset --merge": fix unmerged caseJunio C Hamano2010-01-035-20/+49
| * | | | | | | | | | | | reset: use "unpack_trees()" directly instead of "git read-tree"Stephan Beyer2010-01-033-17/+38
| * | | | | | | | | | | | reset: add a few tests for "git reset --merge"Christian Couder2009-12-301-0/+159
| * | | | | | | | | | | | Documentation: reset: add some tables to describe the different optionsChristian Couder2009-12-301-0/+66
| * | | | | | | | | | | | reset: improve mixed reset error message when in a bare repoChristian Couder2009-12-301-0/+4
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'nd/sparse'Junio C Hamano2010-01-1333-102/+1049
|\ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status