summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* check-ignore: Add option to ignore index contentsdw/check-ignore-sans-indexDave Williams2013-09-123-11/+74
* 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
* | | | | | Merge branch 'aj/p4-symlink-lose-nl'Junio C Hamano2013-09-041-2/+6
|\ \ \ \ \ \
| * | | | | | git-p4: Fix occasional truncation of symlink contents.aj/p4-symlink-lose-nlAlexandru Juncu2013-08-121-2/+6
* | | | | | | Merge branch 'fc/remote-hg-shared-setup'Junio C Hamano2013-09-041-5/+18
|\ \ \ \ \ \ \
| * | | | | | | remote-hg: add shared repo upgradefc/remote-hg-shared-setupFelipe Contreras2013-08-111-0/+12
| * | | | | | | remote-hg: ensure shared repo is initializedFelipe Contreras2013-08-111-5/+6
* | | | | | | | Merge branch 'sb/misc-cleanup'Junio C Hamano2013-09-042-24/+20
|\ \ \ \ \ \ \ \
| * | | | | | | | rm: remove unneeded null pointer checksb/misc-cleanupStefan Beller2013-08-091-21/+17
| * | | | | | | | diff: fix a possible null pointer dereferenceStefan Beller2013-08-091-1/+1
| * | | | | | | | diff: remove ternary operator evaluating always to trueStefan Beller2013-08-091-2/+2
* | | | | | | | | Merge branch 'nd/gc-lock-against-each-other'Junio C Hamano2013-09-043-1/+78
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | gc: reject if another gc is running, unless --force is givenNguyễn Thái Ngọc Duy2013-08-093-1/+78
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge branch 'ap/remote-hg-tilde-is-home-directory'Junio C Hamano2013-09-041-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | remote-hg: fix path when cloning with tilde expansionap/remote-hg-tilde-is-home-directoryAntoine Pelisse2013-08-091-1/+1
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'mm/no-shell-escape-in-die-message'Junio C Hamano2013-09-042-1/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | die_with_status: use "printf '%s\n'", not "echo"mm/no-shell-escape-in-die-messageMatthieu Moy2013-08-072-1/+14
* | | | | | | | | | Merge branch 'tr/fd-gotcha-fixes'Junio C Hamano2013-09-041-0/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t0070: test that git_mkstemps correctly checks return value of open()tr/fd-gotcha-fixesDale R. Worley2013-08-061-0/+4
* | | | | | | | | | | Merge branch 'bc/unuse-packfile'Junio C Hamano2013-09-043-17/+87
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Don't close pack fd when free'ing pack windowsbc/unuse-packfileBrandon Casey2013-08-023-16/+9
| * | | | | | | | | | | sha1_file: introduce close_one_pack() to close packs on fd pressureBrandon Casey2013-08-021-1/+78
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'da/darwin'Junio C Hamano2013-09-044-14/+99
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | OS X: Fix redeclaration of die warningda/darwinBrian Gernhardt2013-08-051-10/+10
| * | | | | | | | | | | Makefile: Fix APPLE_COMMON_CRYPTO with BLK_SHA1Brian Gernhardt2013-08-051-1/+3
| * | | | | | | | | | | imap-send: use Apple's Security framework for base64 encodingJeremy Huddleston2013-07-304-14/+98
* | | | | | | | | | | | Merge branch 'nd/sq-quote-buf'Junio C Hamano2013-09-044-54/+39
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | quote: remove sq_quote_print()nd/sq-quote-bufRamkumar Ramachandra2013-07-302-19/+0
| * | | | | | | | | | | | tar-tree: remove dependency on sq_quote_print()Ramkumar Ramachandra2013-07-301-6/+5
View Lorry Controller Status