Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'nd/clone-connectivity-shortcut' | Junio C Hamano | 2013-09-09 | 5 | -1/+47 |
|\ | |||||
| * | smart http: use the same connectivity check on cloningnd/clone-connectivity-shortcut | Nguyễn Thái Ngọc Duy | 2013-07-23 | 5 | -1/+47 |
* | | Merge branch 'jc/diff-filter-negation' | Junio C Hamano | 2013-09-09 | 4 | -29/+118 |
|\ \ | |||||
| * | | diff: deprecate -q option to diff-filesjc/diff-filter-negation | Junio C Hamano | 2013-07-19 | 4 | -7/+18 |
| * | | diff: allow lowercase letter to specify what change class to exclude | Junio C Hamano | 2013-07-17 | 1 | -1/+28 |
| * | | diff: reject unknown change class given to --diff-filter | Junio C Hamano | 2013-07-17 | 1 | -1/+1 |
| * | | diff: preparse --diff-filter string argument | Junio C Hamano | 2013-07-17 | 2 | -8/+60 |
| * | | diff: factor out match_filter() | Junio C Hamano | 2013-07-17 | 1 | -16/+13 |
| * | | diff: pass the whole diff_options to diffcore_apply_filter() | Junio C Hamano | 2013-07-17 | 1 | -2/+4 |
* | | | Merge branch 'ms/fetch-prune-configuration' | Junio C Hamano | 2013-09-09 | 5 | -3/+128 |
|\ \ \ | |||||
| * | | | fetch: make --prune configurablems/fetch-prune-configuration | Michael Schubert | 2013-07-18 | 5 | -5/+130 |
* | | | | remote-bzr: reuse bzrlib transports when possible | Richard Hansen | 2013-09-08 | 1 | -12/+21 |
* | | | | Sync with maint | Junio C Hamano | 2013-09-05 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'nd/fetch-pack-shallow-fix' into maint | Junio C Hamano | 2013-09-05 | 2 | -1/+19 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'hv/config-from-blob' into maint | Junio C Hamano | 2013-09-05 | 1 | -16/+16 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'maint-1.8.3' into maint | Junio C Hamano | 2013-09-05 | 1 | -2/+2 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'maint-1.8.2' into maint-1.8.3maint-1.8.3 | Junio C Hamano | 2013-09-05 | 1 | -2/+2 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Documentation/git-merge.txt: fix formatting of example blockmaint-1.8.2 | Andreas Schwab | 2013-09-05 | 1 | -2/+2 |
* | | | | | | | | | Update draft release notes after merging the first batch of topics | Junio C Hamano | 2013-09-04 | 1 | -0/+44 |
* | | | | | | | | | Merge branch 'sb/parseopt-boolean-removal' | Junio C Hamano | 2013-09-04 | 42 | -318/+279 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | revert: use the OPT_CMDMODE for parsing, reducing codesb/parseopt-boolean-removal | Stefan Beller | 2013-08-07 | 1 | -47/+15 |
| * | | | | | | | | | checkout-index: fix negations of even numbers of -n | Stefan Beller | 2013-08-07 | 1 | -1/+1 |
| * | | | | | | | | | config parsing options: allow one flag multiple times | Stefan Beller | 2013-08-07 | 1 | -3/+3 |
| * | | | | | | | | | hash-object: replace stdin parsing OPT_BOOLEAN by OPT_COUNTUP | Stefan Beller | 2013-08-07 | 1 | -1/+1 |
| * | | | | | | | | | branch, commit, name-rev: ease up boolean conditions | Stefan Beller | 2013-08-07 | 3 | -3/+4 |
| * | | | | | | | | | checkout: remove superfluous local variable | Stefan Beller | 2013-08-05 | 1 | -7/+5 |
| * | | | | | | | | | log, format-patch: parsing uses OPT__QUIET | Stefan Beller | 2013-08-05 | 2 | -3/+3 |
| * | | | | | | | | | Replace deprecated OPT_BOOLEAN by OPT_BOOL | Stefan Beller | 2013-08-05 | 39 | -227/+227 |
| * | | | | | | | | | Remove deprecated OPTION_BOOLEAN for parsing arguments | Stefan Beller | 2013-08-05 | 7 | -25/+19 |
* | | | | | | | | | | Merge branch 'jc/parseopt-command-modes' | Junio C Hamano | 2013-09-04 | 3 | -20/+68 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | tag: use OPT_CMDMODEjc/parseopt-command-modes | Junio C Hamano | 2013-07-30 | 1 | -15/+12 |
| * | | | | | | | | | parse-options: add OPT_CMDMODE() | Junio C Hamano | 2013-07-30 | 2 | -5/+56 |
* | | | | | | | | | | Merge branch 'jl/some-submodule-config-are-not-boolean' | Junio C Hamano | 2013-09-04 | 2 | -0/+16 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | avoid segfault on submodule.*.path set to an empty "true"jl/some-submodule-config-are-not-boolean | Jharrod LaFon | 2013-08-19 | 2 | -0/+16 |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'sg/bash-prompt-lf-in-cwd-test' | Junio C Hamano | 2013-09-04 | 1 | -0/+23 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | bash prompt: test the prompt with newline in repository pathsg/bash-prompt-lf-in-cwd-test | SZEDER Gábor | 2013-08-18 | 1 | -0/+23 |
* | | | | | | | | | | | Merge branch 'sb/diff-delta-remove-needless-comparison' | Junio C Hamano | 2013-09-04 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | create_delta_index: simplify condition always evaluating to truesb/diff-delta-remove-needless-comparison | Stefan Beller | 2013-08-18 | 1 | -1/+1 |
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'fc/unpack-trees-leakfix' | Junio C Hamano | 2013-09-04 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | unpack-trees: plug a memory leakfc/unpack-trees-leakfix | Felipe Contreras | 2013-08-13 | 1 | -1/+3 |
* | | | | | | | | | | | | Merge branch 'aj/p4-symlink-lose-nl' | Junio C Hamano | 2013-09-04 | 1 | -2/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | git-p4: Fix occasional truncation of symlink contents.aj/p4-symlink-lose-nl | Alexandru Juncu | 2013-08-12 | 1 | -2/+6 |
* | | | | | | | | | | | | | Merge branch 'fc/remote-hg-shared-setup' | Junio C Hamano | 2013-09-04 | 1 | -5/+18 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | remote-hg: add shared repo upgradefc/remote-hg-shared-setup | Felipe Contreras | 2013-08-11 | 1 | -0/+12 |
| * | | | | | | | | | | | | | remote-hg: ensure shared repo is initialized | Felipe Contreras | 2013-08-11 | 1 | -5/+6 |
* | | | | | | | | | | | | | | Merge branch 'sb/misc-cleanup' | Junio C Hamano | 2013-09-04 | 2 | -24/+20 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | rm: remove unneeded null pointer checksb/misc-cleanup | Stefan Beller | 2013-08-09 | 1 | -21/+17 |
| * | | | | | | | | | | | | | | diff: fix a possible null pointer dereference | Stefan Beller | 2013-08-09 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | diff: remove ternary operator evaluating always to true | Stefan Beller | 2013-08-09 | 1 | -2/+2 |
* | | | | | | | | | | | | | | | Merge branch 'nd/gc-lock-against-each-other' | Junio C Hamano | 2013-09-04 | 3 | -1/+78 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |