summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/push-cas'Junio C Hamano2013-09-0922-98/+638
|\
| * 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 'nd/clone-connectivity-shortcut'Junio C Hamano2013-09-095-1/+47
|\ \
| * | smart http: use the same connectivity check on cloningnd/clone-connectivity-shortcutNguyễn Thái Ngọc Duy2013-07-235-1/+47
* | | Merge branch 'jc/diff-filter-negation'Junio C Hamano2013-09-094-29/+118
|\ \ \
| * | | diff: deprecate -q option to diff-filesjc/diff-filter-negationJunio C Hamano2013-07-194-7/+18
| * | | diff: allow lowercase letter to specify what change class to excludeJunio C Hamano2013-07-171-1/+28
| * | | diff: reject unknown change class given to --diff-filterJunio C Hamano2013-07-171-1/+1
| * | | diff: preparse --diff-filter string argumentJunio C Hamano2013-07-172-8/+60
| * | | diff: factor out match_filter()Junio C Hamano2013-07-171-16/+13
| * | | diff: pass the whole diff_options to diffcore_apply_filter()Junio C Hamano2013-07-171-2/+4
* | | | Merge branch 'ms/fetch-prune-configuration'Junio C Hamano2013-09-095-3/+128
|\ \ \ \
| * | | | fetch: make --prune configurablems/fetch-prune-configurationMichael Schubert2013-07-185-5/+130
* | | | | remote-bzr: reuse bzrlib transports when possibleRichard Hansen2013-09-081-12/+21
* | | | | Sync with maintJunio C Hamano2013-09-051-2/+2
|\ \ \ \ \
| * \ \ \ \ Merge branch 'nd/fetch-pack-shallow-fix' into maintJunio C Hamano2013-09-052-1/+19
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'hv/config-from-blob' into maintJunio C Hamano2013-09-051-16/+16
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'maint-1.8.3' into maintJunio C Hamano2013-09-051-2/+2
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'maint-1.8.2' into maint-1.8.3maint-1.8.3Junio C Hamano2013-09-051-2/+2
| | |\ \ \ \ \ \ \
| | | * | | | | | | Documentation/git-merge.txt: fix formatting of example blockmaint-1.8.2Andreas Schwab2013-09-051-2/+2
* | | | | | | | | | Update draft release notes after merging the first batch of topicsJunio C Hamano2013-09-041-0/+44
* | | | | | | | | | Merge branch 'sb/parseopt-boolean-removal'Junio C Hamano2013-09-0442-318/+279
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | revert: use the OPT_CMDMODE for parsing, reducing codesb/parseopt-boolean-removalStefan Beller2013-08-071-47/+15
| * | | | | | | | | | checkout-index: fix negations of even numbers of -nStefan Beller2013-08-071-1/+1
| * | | | | | | | | | config parsing options: allow one flag multiple timesStefan Beller2013-08-071-3/+3
| * | | | | | | | | | hash-object: replace stdin parsing OPT_BOOLEAN by OPT_COUNTUPStefan Beller2013-08-071-1/+1
| * | | | | | | | | | branch, commit, name-rev: ease up boolean conditionsStefan Beller2013-08-073-3/+4
| * | | | | | | | | | checkout: remove superfluous local variableStefan Beller2013-08-051-7/+5
| * | | | | | | | | | log, format-patch: parsing uses OPT__QUIETStefan Beller2013-08-052-3/+3
| * | | | | | | | | | Replace deprecated OPT_BOOLEAN by OPT_BOOLStefan Beller2013-08-0539-227/+227
| * | | | | | | | | | Remove deprecated OPTION_BOOLEAN for parsing argumentsStefan Beller2013-08-057-25/+19
* | | | | | | | | | | Merge branch 'jc/parseopt-command-modes'Junio C Hamano2013-09-043-20/+68
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | tag: use OPT_CMDMODEjc/parseopt-command-modesJunio C Hamano2013-07-301-15/+12
| * | | | | | | | | | parse-options: add OPT_CMDMODE()Junio C Hamano2013-07-302-5/+56
* | | | | | | | | | | Merge branch 'jl/some-submodule-config-are-not-boolean'Junio C Hamano2013-09-042-0/+16
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | avoid segfault on submodule.*.path set to an empty "true"jl/some-submodule-config-are-not-booleanJharrod LaFon2013-08-192-0/+16
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'sg/bash-prompt-lf-in-cwd-test'Junio C Hamano2013-09-041-0/+23
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | bash prompt: test the prompt with newline in repository pathsg/bash-prompt-lf-in-cwd-testSZEDER Gábor2013-08-181-0/+23
* | | | | | | | | | | | Merge branch 'sb/diff-delta-remove-needless-comparison'Junio C Hamano2013-09-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | create_delta_index: simplify condition always evaluating to truesb/diff-delta-remove-needless-comparisonStefan Beller2013-08-181-1/+1
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'fc/unpack-trees-leakfix'Junio C Hamano2013-09-041-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | unpack-trees: plug a memory leakfc/unpack-trees-leakfixFelipe Contreras2013-08-131-1/+3