Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | "log --author=me --grep=it" should find intersection, not union | Junio C Hamano | 2010-01-25 | 6 | -10/+57 |
* | Update draft release notes to 1.7.0 | Junio C Hamano | 2010-01-17 | 1 | -1/+38 |
* | Merge branch 'tc/test-locate-httpd' | Junio C Hamano | 2010-01-17 | 1 | -6/+24 |
|\ | |||||
| * | t/lib-http.sh: Restructure finding of default httpd location | Tarmigan Casebolt | 2010-01-06 | 1 | -6/+24 |
* | | Merge branch 'jh/commit-status' | Junio C Hamano | 2010-01-17 | 4 | -3/+134 |
|\ \ | |||||
| * | | t7502: test commit.status, --status and --no-status | Junio C Hamano | 2010-01-13 | 1 | -0/+109 |
| * | | commit: support commit.status, --status, and --no-status | James P. Howard, II | 2010-01-13 | 3 | -3/+25 |
* | | | Merge branch 'jn/makefile' | Junio C Hamano | 2010-01-17 | 2 | -34/+26 |
|\ \ \ | |||||
| * | | | Makefile: consolidate .FORCE-* targets | Jonathan Nieder | 2010-01-06 | 2 | -11/+8 |
| * | | | Makefile: learn to generate listings for targets requiring special flags | Jonathan Nieder | 2010-01-06 | 1 | -7/+7 |
| * | | | Makefile: use target-specific variable to pass flags to cc | Jonathan Nieder | 2010-01-06 | 1 | -23/+18 |
| * | | | Makefile: regenerate assembler listings when asked | Jonathan Nieder | 2010-01-06 | 1 | -2/+2 |
* | | | | Merge branch 'jc/maint-1.6.1-checkout-m-custom-merge' | Junio C Hamano | 2010-01-17 | 2 | -1/+58 |
|\ \ \ \ | |||||
| * | | | | checkout -m path: fix recreating conflicts | Junio C Hamano | 2010-01-06 | 2 | -1/+58 |
* | | | | | Merge branch 'tc/clone-v-progress' | Junio C Hamano | 2010-01-17 | 6 | -7/+20 |
|\ \ \ \ \ | |||||
| * | | | | | clone: use --progress to force progress reporting | Tay Ray Chuan | 2009-12-28 | 3 | -3/+11 |
| * | | | | | clone: set transport->verbose when -v/--verbose is used | Tay Ray Chuan | 2009-12-28 | 1 | -1/+3 |
| * | | | | | git-clone.txt: reword description of progress behaviour | Tay Ray Chuan | 2009-12-28 | 1 | -3/+6 |
| * | | | | | check stderr with isatty() instead of stdout when deciding to show progress | Tay Ray Chuan | 2009-12-28 | 4 | -4/+4 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'tc/smart-http-restrict' | Junio C Hamano | 2010-01-17 | 7 | -260/+362 |
|\ \ \ \ \ | |||||
| * | | | | | Test t5560: Fix test when run with dash | Tarmigan Casebolt | 2010-01-15 | 1 | -5/+10 |
| * | | | | | Smart-http tests: Test http-backend without curl or a webserver | Tarmigan Casebolt | 2010-01-06 | 2 | -6/+25 |
| * | | | | | Smart-http tests: Break test t5560-http-backend into pieces | Tarmigan Casebolt | 2010-01-06 | 3 | -147/+173 |
| * | | | | | Smart-http tests: Improve coverage in test t5560 | Tarmigan Casebolt | 2010-01-06 | 1 | -11/+10 |
| * | | | | | Smart-http: check if repository is OK to export before serving it | Tarmigan Casebolt | 2010-01-06 | 4 | -2/+55 |
| |/ / / / | |||||
* | | | | | Merge branch 'jk/run-command-use-shell' | Junio C Hamano | 2010-01-17 | 11 | -35/+69 |
|\ \ \ \ \ | |||||
| * | | | | | t4030, t4031: work around bogus MSYS bash path conversion | Johannes Sixt | 2010-01-05 | 2 | -2/+2 |
| * | | | | | diff: run external diff helper with shell | Jeff King | 2010-01-05 | 1 | -1/+1 |
| * | | | | | textconv: use shell to run helper | Jeff King | 2010-01-05 | 3 | -2/+3 |
| * | | | | | editor: use run_command's shell feature | Jeff King | 2010-01-05 | 1 | -19/+2 |
| * | | | | | run-command: optimize out useless shell calls | Jeff King | 2010-01-05 | 1 | -9/+11 |
| * | | | | | run-command: convert simple callsites to use_shell | Jeff King | 2010-01-05 | 4 | -12/+10 |
| * | | | | | t0021: use $SHELL_PATH for the filter script | Johannes Sixt | 2010-01-05 | 1 | -1/+2 |
| * | | | | | run-command: add "use shell" option | Jeff King | 2010-01-01 | 2 | -0/+49 |
| |/ / / / | |||||
* | | | | | Merge branch 'sr/gfi-options' | Junio C Hamano | 2010-01-17 | 3 | -86/+462 |
|\ \ \ \ \ | |||||
| * | | | | | fast-import: add (non-)relative-marks feature | Sverre Rabbelier | 2009-12-05 | 3 | -2/+58 |
| * | | | | | fast-import: allow for multiple --import-marks= arguments | Sverre Rabbelier | 2009-12-04 | 3 | -6/+45 |
| * | | | | | fast-import: test the new option command | Sverre Rabbelier | 2009-12-04 | 1 | -1/+36 |
| * | | | | | fast-import: add option command | Sverre Rabbelier | 2009-12-04 | 2 | -25/+94 |
| * | | | | | fast-import: add feature command | Sverre Rabbelier | 2009-12-04 | 3 | -0/+133 |
| * | | | | | fast-import: put marks reading in its own function | Sverre Rabbelier | 2009-12-04 | 1 | -42/+51 |
| * | | | | | fast-import: put option parsing code in separate functions | Sverre Rabbelier | 2009-12-04 | 1 | -40/+75 |
* | | | | | | Update COPYING with GPLv2 with new FSF address | Junio C Hamano | 2010-01-17 | 1 | -13/+12 |
* | | | | | | Merge branch 'maint' | Junio C Hamano | 2010-01-16 | 3 | -4/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix uninitialized variable in get_refs_via_rsync(). | Richard Weinberger | 2010-01-15 | 1 | -1/+1 |
| * | | | | | | Document git-blame triple -C option | Ramkumar Ramachandra | 2010-01-14 | 2 | -3/+5 |
* | | | | | | | Merge branch 'cc/reset-more' | Junio C Hamano | 2010-01-16 | 1 | -10/+10 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t7111: fix bad HEAD in tests with unmerged entries | Christian Couder | 2010-01-16 | 1 | -10/+10 |
* | | | | | | | | Merge branch 'jc/checkout-merge-base' | Junio C Hamano | 2010-01-13 | 7 | -5/+222 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | rebase -i: teach --onto A...B syntax | Nanako Shiraishi | 2010-01-07 | 2 | -1/+50 |