summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/push-cas'Junio C Hamano2013-09-094-0/+42
|\
| * send-pack: fix parsing of --force-with-lease optionJunio C Hamano2013-08-021-1/+1
| * push --force-with-lease: tie it all togetherJunio C Hamano2013-07-221-0/+5
| * push --force-with-lease: implement logic to populate old_sha1_expect[]Junio C Hamano2013-07-222-0/+10
| * remote.c: add command line option parser for "--force-with-lease"Junio C Hamano2013-07-222-0/+23
| * 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-083-0/+4
* | Merge branch 'nd/clone-connectivity-shortcut'Junio C Hamano2013-09-091-0/+9
|\ \
| * | smart http: use the same connectivity check on cloningnd/clone-connectivity-shortcutNguyễn Thái Ngọc Duy2013-07-231-0/+9
* | | Merge branch 'ms/fetch-prune-configuration'Junio C Hamano2013-09-091-3/+32
|\ \ \
| * | | fetch: make --prune configurablems/fetch-prune-configurationMichael Schubert2013-07-181-5/+34
* | | | Merge branch 'sb/parseopt-boolean-removal'Junio C Hamano2013-09-0440-315/+276
|\ \ \ \
| * | | | 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-051-3/+2
| * | | | Replace deprecated OPT_BOOLEAN by OPT_BOOLStefan Beller2013-08-0539-227/+227
| * | | | Remove deprecated OPTION_BOOLEAN for parsing argumentsStefan Beller2013-08-056-22/+17
* | | | | Merge branch 'jc/parseopt-command-modes'Junio C Hamano2013-09-041-15/+12
|\ \ \ \ \ | |/ / / /
| * | | | tag: use OPT_CMDMODEjc/parseopt-command-modesJunio C Hamano2013-07-301-15/+12
* | | | | Merge branch 'sb/misc-cleanup'Junio C Hamano2013-09-041-21/+17
|\ \ \ \ \
| * | | | | rm: remove unneeded null pointer checksb/misc-cleanupStefan Beller2013-08-091-21/+17
* | | | | | Merge branch 'nd/gc-lock-against-each-other'Junio C Hamano2013-09-041-0/+67
|\ \ \ \ \ \
| * | | | | | gc: reject if another gc is running, unless --force is givenNguyễn Thái Ngọc Duy2013-08-091-0/+67
* | | | | | | Merge branch 'bc/unuse-packfile'Junio C Hamano2013-09-041-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Don't close pack fd when free'ing pack windowsbc/unuse-packfileBrandon Casey2013-08-021-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'nd/sq-quote-buf'Junio C Hamano2013-09-042-10/+14
|\ \ \ \ \ \ \
| * | | | | | | tar-tree: remove dependency on sq_quote_print()Ramkumar Ramachandra2013-07-301-6/+5
| * | | | | | | for-each-ref, quote: convert *_quote_print -> *_quote_bufNguyễn Thái Ngọc Duy2013-07-301-4/+9
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'jc/check-x-z'Junio C Hamano2013-09-042-12/+20
|\ \ \ \ \ \ \
| * | | | | | | check-attr -z: a single -z should apply to both input and outputjc/check-x-zJunio C Hamano2013-07-111-3/+11
| * | | | | | | check-ignore -z: a single -z should apply to both input and outputJunio C Hamano2013-07-111-1/+1
| * | | | | | | check-attr: the name of the character is NUL, not NULLJunio C Hamano2013-07-111-4/+4
| * | | | | | | check-ignore: the name of the character is NUL, not NULLJunio C Hamano2013-07-111-6/+6
* | | | | | | | Merge branch 'rj/doc-rev-parse'Junio C Hamano2013-08-301-15/+13
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | rev-parse: remove restrictions on some optionsJohn Keeping2013-07-221-15/+13
* | | | | | | | Merge branch 'jk/cat-file-batch-optim'Junio C Hamano2013-08-021-19/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert "cat-file: split --batch input lines on whitespace"Junio C Hamano2013-08-021-19/+1
* | | | | | | | | Merge branch 'ob/typofixes'Junio C Hamano2013-08-012-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | many small typofixesob/typofixesOndřej Bílka2013-07-292-2/+2
* | | | | | | | | | Merge branch 'jc/rm-submodule-error-message'Junio C Hamano2013-08-011-21/+20
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | builtin/rm.c: consolidate error reporting for removing submodulesjc/rm-submodule-error-messageJunio C Hamano2013-07-251-21/+20
* | | | | | | | | | | Merge branch 'jx/clean-interactive'Junio C Hamano2013-08-011-28/+52
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git-clean: implement partial matching for selectionJiang Xin2013-07-241-28/+52
* | | | | | | | | | | | Merge branch 'jk/commit-how-to-abort-cherry-pick'Junio C Hamano2013-07-311-3/+22
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | commit: tweak empty cherry pick advice for sequencerjk/commit-how-to-abort-cherry-pickJeff King2013-07-291-3/+22
* | | | | | | | | | | | Merge branch 'jk/cat-file-batch-optim'Junio C Hamano2013-07-241-3/+13
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | |