summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* t5541: mark passing c-a-s test as successjc/push-casJeff King2013-09-201-1/+1
* push: teach --force-with-lease to smart-http transportJunio C Hamano2013-08-024-5/+40
* send-pack: fix parsing of --force-with-lease optionJunio C Hamano2013-08-021-1/+1
* t5540/5541: smart-http does not support "--force-with-lease"Junio C Hamano2013-08-011-0/+16
* t5533: test "push --force-with-lease"Junio C Hamano2013-07-221-0/+189
* push --force-with-lease: tie it all togetherJunio C Hamano2013-07-226-13/+54
* push --force-with-lease: implement logic to populate old_sha1_expect[]Junio C Hamano2013-07-226-0/+87
* remote.c: add command line option parser for "--force-with-lease"Junio C Hamano2013-07-225-11/+168
* builtin/push.c: use OPT_BOOL, not OPT_BOOLEANJunio C Hamano2013-07-081-3/+3
* cache.h: move remote/connect API out of itJunio C Hamano2013-07-0815-70/+87
* Merge branch 'maint'Junio C Hamano2013-07-052-19/+0
|\
| * fixup-builtins: retire an old transition helper scriptRamkumar Ramachandra2013-07-032-19/+0
* | Merge branch 'tr/test-v-and-v-subtest-only'Junio C Hamano2013-07-056-53/+276
|\ \
| * | perf-lib: fix start/stop of perf testsThomas Gummerer2013-06-291-1/+2
| * | test-lib: support running tests under valgrind in parallelThomas Rast2013-06-231-22/+84
| * | test-lib: allow prefixing a custom string before "ok N" etc.Thomas Rast2013-06-231-12/+15
| * | test-lib: valgrind for only tests matching a patternThomas Rast2013-06-233-1/+43
| * | test-lib: verbose mode for only tests matching a patternThomas Rast2013-06-233-0/+60
| * | test-lib: self-test that --verbose worksThomas Rast2013-06-232-1/+38
| * | test-lib: rearrange start/end of test_expect_* and test_skipThomas Rast2013-06-182-3/+12
| * | test-lib: refactor $GIT_SKIP_TESTS matchingThomas Rast2013-06-181-17/+24
| * | test-lib: enable MALLOC_* for the actual testsThomas Rast2013-06-171-0/+2
* | | Merge branch 'maint'Junio C Hamano2013-07-032-1/+16
|\ \ \ | | |/ | |/|
| * | Update draft release notes to 1.8.3.3Junio C Hamano2013-07-031-0/+15
| * | Merge branch 'rr/diffcore-pickaxe-doc' into maintJunio C Hamano2013-07-033-28/+59
| |\ \
| * \ \ Merge branch 'cr/git-work-tree-sans-git-dir' into maintJunio C Hamano2013-07-031-3/+1
| |\ \ \
| * \ \ \ Merge branch 'fc/do-not-use-the-index-in-add-to-index' into maintJunio C Hamano2013-07-031-3/+3
| |\ \ \ \
| * \ \ \ \ Merge branch 'dm/unbash-subtree' into maintJunio C Hamano2013-07-031-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jc/core-checkstat' into maintJunio C Hamano2013-07-031-1/+14
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jc/t5551-posix-sed-bre' into maintJunio C Hamano2013-07-031-2/+6
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'vv/help-unknown-ref' into maintJunio C Hamano2013-07-033-1/+57
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'rs/empty-archive' into maintJunio C Hamano2013-07-032-0/+15
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'rh/merge-options-doc-fix' into maintJunio C Hamano2013-07-031-1/+2
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'an/diff-index-doc' into maintJunio C Hamano2013-07-031-6/+6
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cm/gitweb-project-list-persistent-cgi-fix' into maintJunio C Hamano2013-07-031-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ar/wildmatch-foldcase' into maintJunio C Hamano2013-07-032-6/+56
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'cb/log-follow-with-combined' into maintJunio C Hamano2013-07-032-0/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rr/die-on-missing-upstream' into maintJunio C Hamano2013-07-032-17/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'maint-1.8.2' into maintJunio C Hamano2013-07-031-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'maint-1.8.1' into maint-1.8.2Junio C Hamano2013-07-031-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | git-config: update doc for --get with multiple valuesmaint-1.8.1John Keeping2013-07-031-1/+1
* | | | | | | | | | | | | | | | | | | git-remote-mediawiki: un-brace file handles in binmode callsMatthieu Moy2013-07-031-2/+2
* | | | | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2013-07-012-3/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | t7500: fix flipped actual/expectAndrew Pimlott2013-07-011-3/+3
| * | | | | | | | | | | | | | | | | | lib-rebase: document exec_ in FAKE_LINESAndrew Pimlott2013-07-011-0/+2
* | | | | | | | | | | | | | | | | | | Update draft release notes to 1.8.4Junio C Hamano2013-07-011-0/+16
* | | | | | | | | | | | | | | | | | | Merge branch 'rr/remote-branch-config-refresh'Junio C Hamano2013-07-013-402/+480
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | t/t5505-remote: test multiple push/pull in remotes-fileRamkumar Ramachandra2013-06-231-2/+14
| * | | | | | | | | | | | | | | | | | | ls-remote doc: don't encourage use of branches-fileRamkumar Ramachandra2013-06-231-2/+2
| * | | | | | | | | | | | | | | | | | | ls-remote doc: rewrite <repository> paragraphRamkumar Ramachandra2013-06-231-3/+3