summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fl/askpass'Junio C Hamano2010-03-205-13/+58
|\
| * git-core: Support retrieving passwords with GIT_ASKPASSFrank Li2010-03-044-3/+41
| * git-svn: Support retrieving passwords with GIT_ASKPASSFrank Li2010-03-021-10/+17
* | Merge branch 'bg/apply-fix-blank-at-eof'Junio C Hamano2010-03-204-40/+450
|\ \
| * | t3417: Add test cases for "rebase --whitespace=fix"Björn Gustavsson2010-03-061-0/+126
| * | t4124: Add additional tests of --whitespace=fixBjörn Gustavsson2010-03-061-0/+170
| * | apply: Allow blank context lines to match beyond EOFBjörn Gustavsson2010-03-061-30/+138
| * | apply: Remove the quick rejection testBjörn Gustavsson2010-03-062-5/+16
| * | apply: Don't unnecessarily update line lengths in the preimageBjörn Gustavsson2010-03-061-11/+6
* | | Merge branch 'bw/union-merge-refactor'Junio C Hamano2010-03-206-79/+92
|\ \ \
| * | | merge-file: add option to select union merge favorBert Wesarg2010-03-022-6/+9
| * | | merge-file: add option to specify the marker sizeBert Wesarg2010-03-023-2/+42
| * | | refactor merge flags into xmparam_tBert Wesarg2010-03-024-29/+25
| * | | make union merge an xdl merge favorBert Wesarg2010-03-023-45/+19
| |/ /
* | | Merge branch 'maint'Junio C Hamano2010-03-205-9/+20
|\ \ \
| * | | Update draft release notes to 1.7.0.3Junio C Hamano2010-03-201-1/+7
| * | | fetch: Fix minor memory leakAndreas Gruenbacher2010-03-201-2/+3
| * | | fetch: Future-proof initialization of a refspec on stackAndreas Gruenbacher2010-03-201-3/+1
| * | | fetch: Check for a "^{}" suffix with suffixcmp()Andreas Gruenbacher2010-03-201-1/+1
| * | | daemon: parse_host_and_port SIGSEGV if port is specifiedImre Deak2010-03-201-1/+1
| * | | Makefile: Fix CDPATH problemJonathan Nieder2010-03-201-0/+6
| * | | pull: replace unnecessary sed invocationStephen Boyd2010-03-201-1/+1
* | | | Fix a spelling mistake in a git-p4 console messageBenjamin C Meyer2010-03-201-1/+1
* | | | Use test_expect_success for test setupsBrian Gernhardt2010-03-205-61/+70
* | | | Makefile: Fix occasional GIT-CFLAGS breakageJonathan Nieder2010-03-201-10/+11
* | | | notes.c: remove inappropriate call to returnBrandon Casey2010-03-201-1/+1
* | | | Merge branch 'maint'Junio C Hamano2010-03-172-2/+4
|\ \ \ \ | |/ / /
| * | | Documentation: receive.denyCurrentBranch defaults to 'refuse'Thomas Rast2010-03-171-1/+1
| * | | bash: complete *_HEAD refs if presentIan Ward Comfort2010-03-171-1/+3
* | | | Merge branch 'maint'Junio C Hamano2010-03-161-22/+24
|\ \ \ \ | |/ / /
| * | | Documentation/git-read-tree: clarify 2-tree mergeMichael J Gruber2010-03-151-13/+15
| * | | Documentation/git-read-tree: fix table layoutMichael J Gruber2010-03-151-10/+10
* | | | Merge branch 'sd/format-patch-to'Junio C Hamano2010-03-155-46/+197
|\ \ \ \
| * | | | send-email: add --no-cc, --no-to, and --no-bccStephen Boyd2010-03-082-4/+76
| * | | | format-patch: add --no-cc, --no-to, and --no-add-headersStephen Boyd2010-03-082-7/+56
| * | | | format-patch: use a string_list for headersStephen Boyd2010-03-081-39/+34
| * | | | Add 'git format-patch --to=' option and 'format.to' configuration variable.Steven Drake2010-03-063-3/+38
| | |/ / | |/| |
* | | | Merge branch 'tc/http-cleanup'Junio C Hamano2010-03-158-39/+66
|\ \ \ \
| * | | | remote-curl: init walker only when neededTay Ray Chuan2010-03-021-10/+3
| * | | | remote-curl: use http_fetch_ref() instead of walker wrapperTay Ray Chuan2010-03-021-2/+1
| * | | | http: init and cleanup separately from http-walkerTay Ray Chuan2010-03-024-8/+12
| * | | | http-walker: cleanup more thoroughlyTay Ray Chuan2010-03-021-0/+17
| * | | | http-push: remove "|| 1" to enable verbose checkTay Ray Chuan2010-03-021-1/+1
| * | | | t554[01]-http-push: refactor, add non-ff testsTay Ray Chuan2010-03-023-22/+34
| * | | | t5541-http-push: check that ref is unchanged for non-ff testTay Ray Chuan2010-03-021-2/+4
| |/ / /
* | | | Merge branch 'tc/transport-verbosity'Junio C Hamano2010-03-1512-41/+92
|\ \ \ \
| * | | | transport: update flags to be in running orderTay Ray Chuan2010-02-241-2/+2
| * | | | fetch and pull: learn --progressTay Ray Chuan2010-02-244-5/+18
| * | | | push: learn --progressTay Ray Chuan2010-02-242-2/+11
| * | | | transport->progress: use flag authoritativelyTay Ray Chuan2010-02-246-12/+27