aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* git_remote_helpers: remove little used Python libraryJohn Keeping2013-09-09
* Sync with maintJunio C Hamano2013-09-05
|\
| * Merge branch 'nd/fetch-pack-shallow-fix' into maintJunio C Hamano2013-09-05
| |\
| * \ Merge branch 'hv/config-from-blob' into maintJunio C Hamano2013-09-05
| |\ \
| * \ \ Merge branch 'maint-1.8.3' into maintJunio C Hamano2013-09-05
| |\ \ \
| | * \ \ Merge branch 'maint-1.8.2' into maint-1.8.3Junio C Hamano2013-09-05
| | |\ \ \
| | | * | | Documentation/git-merge.txt: fix formatting of example blockAndreas Schwab2013-09-05
* | | | | | Update draft release notes after merging the first batch of topicsJunio C Hamano2013-09-04
* | | | | | Merge branch 'sb/parseopt-boolean-removal'Junio C Hamano2013-09-04
|\ \ \ \ \ \
| * | | | | | revert: use the OPT_CMDMODE for parsing, reducing codeStefan Beller2013-08-07
| * | | | | | checkout-index: fix negations of even numbers of -nStefan Beller2013-08-07
| * | | | | | config parsing options: allow one flag multiple timesStefan Beller2013-08-07
| * | | | | | hash-object: replace stdin parsing OPT_BOOLEAN by OPT_COUNTUPStefan Beller2013-08-07
| * | | | | | branch, commit, name-rev: ease up boolean conditionsStefan Beller2013-08-07
| * | | | | | checkout: remove superfluous local variableStefan Beller2013-08-05
| * | | | | | log, format-patch: parsing uses OPT__QUIETStefan Beller2013-08-05
| * | | | | | Replace deprecated OPT_BOOLEAN by OPT_BOOLStefan Beller2013-08-05
| * | | | | | Remove deprecated OPTION_BOOLEAN for parsing argumentsStefan Beller2013-08-05
* | | | | | | Merge branch 'jc/parseopt-command-modes'Junio C Hamano2013-09-04
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | tag: use OPT_CMDMODEJunio C Hamano2013-07-30
| * | | | | | parse-options: add OPT_CMDMODE()Junio C Hamano2013-07-30
* | | | | | | Merge branch 'jl/some-submodule-config-are-not-boolean'Junio C Hamano2013-09-04
|\ \ \ \ \ \ \
| * | | | | | | avoid segfault on submodule.*.path set to an empty "true"Jharrod LaFon2013-08-19
* | | | | | | | Merge branch 'sg/bash-prompt-lf-in-cwd-test'Junio C Hamano2013-09-04
|\ \ \ \ \ \ \ \
| * | | | | | | | bash prompt: test the prompt with newline in repository pathSZEDER Gábor2013-08-18
* | | | | | | | | Merge branch 'sb/diff-delta-remove-needless-comparison'Junio C Hamano2013-09-04
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | create_delta_index: simplify condition always evaluating to trueStefan Beller2013-08-18
* | | | | | | | | | Merge branch 'fc/unpack-trees-leakfix'Junio C Hamano2013-09-04
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | unpack-trees: plug a memory leakFelipe Contreras2013-08-13
* | | | | | | | | | | Merge branch 'aj/p4-symlink-lose-nl'Junio C Hamano2013-09-04
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git-p4: Fix occasional truncation of symlink contents.Alexandru Juncu2013-08-12
* | | | | | | | | | | | Merge branch 'fc/remote-hg-shared-setup'Junio C Hamano2013-09-04
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | remote-hg: add shared repo upgradeFelipe Contreras2013-08-11
| * | | | | | | | | | | | remote-hg: ensure shared repo is initializedFelipe Contreras2013-08-11
* | | | | | | | | | | | | Merge branch 'sb/misc-cleanup'Junio C Hamano2013-09-04
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | rm: remove unneeded null pointer checkStefan Beller2013-08-09
| * | | | | | | | | | | | | diff: fix a possible null pointer dereferenceStefan Beller2013-08-09
| * | | | | | | | | | | | | diff: remove ternary operator evaluating always to trueStefan Beller2013-08-09
* | | | | | | | | | | | | | Merge branch 'nd/gc-lock-against-each-other'Junio C Hamano2013-09-04
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | gc: reject if another gc is running, unless --force is givenNguyễn Thái Ngọc Duy2013-08-09
| | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'ap/remote-hg-tilde-is-home-directory'Junio C Hamano2013-09-04
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | remote-hg: fix path when cloning with tilde expansionAntoine Pelisse2013-08-09
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'mm/no-shell-escape-in-die-message'Junio C Hamano2013-09-04
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | die_with_status: use "printf '%s\n'", not "echo"Matthieu Moy2013-08-07
* | | | | | | | | | | | | | | Merge branch 'tr/fd-gotcha-fixes'Junio C Hamano2013-09-04
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | t0070: test that git_mkstemps correctly checks return value of open()Dale R. Worley2013-08-06
* | | | | | | | | | | | | | | | Merge branch 'bc/unuse-packfile'Junio C Hamano2013-09-04
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Don't close pack fd when free'ing pack windowsBrandon Casey2013-08-02
| * | | | | | | | | | | | | | | | sha1_file: introduce close_one_pack() to close packs on fd pressureBrandon Casey2013-08-02
| | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'da/darwin'Junio C Hamano2013-09-04
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \