Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'km/gc-eperm' into maint | Junio C Hamano | 2014-01-13 | 1 | -1/+1 |
|\ | |||||
| * | gc: notice gc processes run by other users | Kyle J. McKay | 2014-01-03 | 1 | -1/+1 |
* | | Merge branch 'mm/mv-file-to-no-such-dir-with-slash' into maint | Junio C Hamano | 2014-01-13 | 1 | -7/+18 |
|\ \ | |||||
| * | | mv: let 'git mv file no-such-dir/' error out on Windows, too | Johannes Sixt | 2014-01-10 | 1 | -0/+2 |
| * | | mv: let 'git mv file no-such-dir/' error out | Matthieu Moy | 2013-12-04 | 1 | -7/+16 |
| |/ | |||||
* | | Merge branch 'jk/rev-parse-double-dashes' into maint | Junio C Hamano | 2014-01-13 | 1 | -1/+15 |
|\ \ | |||||
| * | | rev-parse: be more careful with munging arguments | Jeff King | 2013-12-09 | 1 | -1/+5 |
| * | | rev-parse: correctly diagnose revision errors before "--" | Jeff King | 2013-12-09 | 1 | -0/+10 |
| |/ | |||||
* | | Merge branch 'jk/cat-file-regression-fix' into maint | Junio C Hamano | 2014-01-13 | 1 | -10/+20 |
|\ \ | |||||
| * | | cat-file: handle --batch format with missing type/size | Jeff King | 2013-12-12 | 1 | -1/+10 |
| * | | cat-file: pass expand_data to print_object_or_die | Jeff King | 2013-12-12 | 1 | -10/+11 |
| |/ | |||||
* | | for-each-ref: remove unused variable | Ramkumar Ramachandra | 2013-12-30 | 1 | -2/+1 |
* | | Merge branch 'nd/magic-pathspec' into maint | Junio C Hamano | 2013-12-17 | 1 | -10/+7 |
|\ \ | |||||
| * | | diff: restrict pathspec limitations to diff b/f case only | Nguyễn Thái Ngọc Duy | 2013-11-21 | 1 | -10/+7 |
* | | | cmd_repack(): remove redundant local variable "nr_packs" | Michael Haggerty | 2013-12-17 | 1 | -4/+2 |
| |/ |/| | |||||
* | | Merge branch 'nd/literal-pathspecs' | Junio C Hamano | 2013-11-18 | 1 | -1/+3 |
|\ \ | |||||
| * | | pathspec: stop --*-pathspecs impact on internal parse_pathspec() uses | Nguyễn Thái Ngọc Duy | 2013-10-28 | 1 | -1/+3 |
* | | | Merge branch 'jx/branch-vv-always-compare-with-upstream' | Junio C Hamano | 2013-11-18 | 1 | -1/+7 |
|\ \ \ | |||||
| * | | | branch: fix --verbose output column alignment | Torstein Hegge | 2013-11-18 | 1 | -1/+7 |
* | | | | Merge branch 'fc/trivial' | Junio C Hamano | 2013-11-06 | 4 | -16/+7 |
|\ \ \ \ | |||||
| * | | | | diff: trivial style fix | Felipe Contreras | 2013-10-31 | 1 | -1/+1 |
| * | | | | describe: trivial style fixes | Felipe Contreras | 2013-10-31 | 1 | -4/+3 |
| * | | | | branch: trivial style fix | Felipe Contreras | 2013-10-31 | 1 | -2/+1 |
| * | | | | merge: simplify ff-only option | Felipe Contreras | 2013-10-31 | 1 | -9/+2 |
* | | | | | Merge branch 'jk/reset-p-current-head-fix' | Junio C Hamano | 2013-11-01 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | reset: pass real rev name to add--interactive | Jeff King | 2013-10-25 | 1 | -1/+1 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'jk/for-each-ref-skip-parsing' | Junio C Hamano | 2013-11-01 | 1 | -9/+20 |
|\ \ \ \ \ | |||||
| * | | | | | for-each-ref: avoid loading objects to print %(objectname) | Jeff King | 2013-10-30 | 1 | -9/+20 |
* | | | | | | Merge branch 'jl/submodule-mv' | Junio C Hamano | 2013-11-01 | 1 | -4/+9 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | mv: Fix spurious warning when moving a file in presence of submodules | Jens Lehmann | 2013-10-14 | 1 | -4/+9 |
* | | | | | | Merge branch 'nd/lift-path-max' | Junio C Hamano | 2013-10-30 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | checkout_entry(): clarify the use of topath[] parameter | Junio C Hamano | 2013-10-24 | 1 | -1/+1 |
| * | | | | | | Merge branch 'ap/commit-author-mailmap' into maint | Junio C Hamano | 2013-10-18 | 1 | -1/+7 |
| |\ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ | Merge branch 'nd/gc-lock-against-each-other' | Junio C Hamano | 2013-10-30 | 1 | -0/+24 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | gc: remove gc.pid file at end of execution | Jonathan Nieder | 2013-10-18 | 1 | -0/+24 |
* | | | | | | | | | Merge branch 'mm/checkout-auto-track-fix' | Junio C Hamano | 2013-10-30 | 1 | -28/+71 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | checkout: proper error message on 'git checkout foo bar --' | Matthieu Moy | 2013-10-18 | 1 | -5/+16 |
| * | | | | | | | | | checkout: allow dwim for branch creation for "git checkout $branch --" | Matthieu Moy | 2013-10-18 | 1 | -23/+55 |
* | | | | | | | | | | Merge branch 'fc/styles' | Junio C Hamano | 2013-10-30 | 3 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | |||||
| * | | | | | | | | | C: have space around && and || operators | Junio C Hamano | 2013-10-16 | 3 | -3/+3 |
* | | | | | | | | | | Merge branch 'hu/cherry-pick-previous-branch' | Junio C Hamano | 2013-10-23 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | cherry-pick: handle "-" after parsing options | Jeff King | 2013-10-11 | 1 | -2/+2 |
* | | | | | | | | | | | Merge branch 'mg/more-textconv' | Junio C Hamano | 2013-10-23 | 3 | -18/+39 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | grep: honor --textconv for the case rev:path | Michael J Gruber | 2013-05-10 | 1 | -5/+6 |
| * | | | | | | | | | | | grep: allow to use textconv filters | Jeff King | 2013-05-10 | 1 | -0/+2 |
| * | | | | | | | | | | | cat-file: do not die on --textconv without textconv filters | Michael J Gruber | 2013-05-10 | 1 | -10/+8 |
| * | | | | | | | | | | | show: honor --textconv for blobs | Michael J Gruber | 2013-05-10 | 1 | -3/+22 |
| * | | | | | | | | | | | diff_opt: track whether flags have been set explicitly | Junio C Hamano | 2013-05-10 | 1 | -0/+1 |
* | | | | | | | | | | | | Merge branch 'jc/pack-objects' | Junio C Hamano | 2013-10-23 | 1 | -11/+12 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | pack-objects: shrink struct object_entry | Junio C Hamano | 2013-02-05 | 1 | -11/+12 |