Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | replace: use argv_array in export_objectcc/replace-edit | Jeff King | 2014-06-25 | 1 | -3/+5 |
* | avoid double close of descriptors handed to run_command | Jeff King | 2014-06-25 | 1 | -2/+0 |
* | replace: replace spaces with tabs in indentation | Jeff King | 2014-06-25 | 1 | -3/+3 |
* | replace: add --edit to usage string | Christian Couder | 2014-05-19 | 1 | -0/+1 |
* | replace: die early if replace ref already exists | Christian Couder | 2014-05-19 | 1 | -1/+4 |
* | replace: refactor checking ref validity | Christian Couder | 2014-05-19 | 1 | -11/+20 |
* | replace: make sure --edit results in a different object | Christian Couder | 2014-05-19 | 1 | -0/+3 |
* | replace: add --edit option | Jeff King | 2014-04-29 | 1 | -1/+111 |
* | replace: factor object resolution out of replace_object | Jeff King | 2014-04-29 | 1 | -8/+18 |
* | replace: use OPT_CMDMODE to handle modes | Jeff King | 2014-04-29 | 1 | -24/+25 |
* | replace: refactor command-mode determination | Jeff King | 2014-04-29 | 1 | -8/+6 |
* | i18n: only extract comments marked with "TRANSLATORS:" | Jiang Xin | 2014-04-17 | 1 | -5/+3 |
* | Merge branch 'jk/pack-bitmap' | Junio C Hamano | 2014-04-08 | 1 | -1/+12 |
|\ | |||||
| * | pack-objects: do not reuse packfiles without --delta-base-offset | Jeff King | 2014-04-04 | 1 | -1/+12 |
* | | Merge branch 'jl/nor-or-nand-and' | Junio C Hamano | 2014-04-08 | 6 | -8/+8 |
|\ \ | |||||
| * | | code and test: fix misuses of "nor"jl/nor-or-nand-and | Justin Lebar | 2014-03-31 | 2 | -4/+4 |
| * | | comments: fix misuses of "nor" | Justin Lebar | 2014-03-31 | 4 | -4/+4 |
| * | | Merge branch 'jk/clean-d-pathspec' into maint | Junio C Hamano | 2014-03-18 | 1 | -11/+9 |
| |\ \ | |||||
| * \ \ | Merge branch 'nd/reset-setup-worktree' into maint | Junio C Hamano | 2014-03-18 | 1 | -3/+4 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'jc/check-attr-honor-working-tree' into maint | Junio C Hamano | 2014-03-18 | 1 | -0/+3 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'ds/rev-parse-required-args' into maint | Junio C Hamano | 2014-03-18 | 1 | -6/+11 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'nd/submodule-pathspec-ending-with-slash' into maint | Junio C Hamano | 2014-03-18 | 9 | -36/+18 |
| |\ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ | Merge branch 'mh/update-ref-batch-create-fix' | Junio C Hamano | 2014-04-08 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | update-ref: fail create operation over stdin if ref already existsmh/update-ref-batch-create-fix | Aman Gupta | 2014-04-02 | 1 | -0/+1 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'jc/rev-parse-argh-dashed-multi-words' | Junio C Hamano | 2014-04-08 | 7 | -9/+37 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | update-index: teach --cacheinfo a new syntax "mode,sha1,path" | Junio C Hamano | 2014-03-24 | 1 | -3/+31 |
| * | | | | | | | | parse-options: multi-word argh should use dash to separate words | Junio C Hamano | 2014-03-24 | 6 | -6/+6 |
* | | | | | | | | | Merge branch 'nd/gc-aggressive' | Junio C Hamano | 2014-04-03 | 1 | -1/+7 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | gc --aggressive: make --depth configurable | Nguyễn Thái Ngọc Duy | 2014-03-31 | 1 | -1/+7 |
* | | | | | | | | | | Merge branch 'nd/log-show-linear-break' | Junio C Hamano | 2014-04-03 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | object.h: centralize object flag allocation | Nguyễn Thái Ngọc Duy | 2014-03-25 | 1 | -1/+1 |
* | | | | | | | | | | | Merge branch 'ib/rev-parse-parseopt-argh' | Junio C Hamano | 2014-03-31 | 1 | -1/+12 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | rev-parse --parseopt: option argument name hints | Ilya Bobyr | 2014-03-23 | 1 | -1/+12 |
* | | | | | | | | | | | Merge branch 'bp/commit-p-editor' | Junio C Hamano | 2014-03-28 | 5 | -17/+38 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | merge: fix GIT_EDITOR override for commit hook | Benoit Pierre | 2014-03-18 | 1 | -1/+1 |
| * | | | | | | | | | | | commit: fix patch hunk editing with "commit -p -m" | Benoit Pierre | 2014-03-18 | 5 | -17/+38 |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'fr/add-interactive-argv-array' | Junio C Hamano | 2014-03-28 | 1 | -11/+10 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | add: use struct argv_array in run_add_interactive()fr/add-interactive-argv-array | Fabian Ruch | 2014-03-18 | 1 | -11/+10 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Merge branch 'jk/pack-bitmap-progress' | Junio C Hamano | 2014-03-28 | 1 | -11/+19 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | pack-objects: show reused packfile objects in "Counting objects"jk/pack-bitmap-progress | Jeff King | 2014-03-17 | 1 | -8/+3 |
| * | | | | | | | | | | | pack-objects: show progress for reused packfiles | Jeff King | 2014-03-17 | 1 | -3/+16 |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'jk/pack-bitmap' | Junio C Hamano | 2014-03-28 | 1 | -1/+11 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||||
| * | | | | | | | | | | pack-objects: turn off bitmaps when skipping objects | Jeff King | 2014-03-17 | 1 | -1/+11 |
* | | | | | | | | | | | Merge branch 'nd/index-pack-error-message' | Junio C Hamano | 2014-03-25 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | index-pack: report error using the correct variablend/index-pack-error-message | Junio C Hamano | 2014-03-17 | 1 | -2/+2 |
* | | | | | | | | | | | | Merge branch 'nd/commit-editor-cleanup' | Junio C Hamano | 2014-03-25 | 1 | -3/+11 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | commit: add --cleanup=scissorsnd/commit-editor-cleanup | Nguyễn Thái Ngọc Duy | 2014-02-25 | 1 | -3/+11 |
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'jk/warn-on-object-refname-ambiguity' | Junio C Hamano | 2014-03-25 | 1 | -6/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | cat-file: restore warn_on_object_refname_ambiguity flag | Jeff King | 2014-03-13 | 1 | -0/+3 |
| * | | | | | | | | | | | | cat-file: fix a minor memory leak in batch_objects | Jeff King | 2014-01-07 | 1 | -0/+1 |