summaryrefslogtreecommitdiff
path: root/builtin/replace.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'js/replace-edit-use-editor-configuration' into maintJunio C Hamano2016-05-061-0/+1
|\
| * replace --edit: respect core.editorjs/replace-edit-use-editor-configurationJohannes Schindelin2016-04-201-0/+1
* | Convert struct object to object_idbrian m. carlson2015-11-201-3/+3
|/
* Merge branch 'mh/replace-refs'Junio C Hamano2015-08-031-3/+3
|\
| * Allow to control where the replace refs are looked formh/replace-refsMike Hommey2015-06-121-3/+3
* | show_reference(): rewrite to take an object_id argumentMichael Haggerty2015-05-251-10/+8
* | each_ref_fn: change to take an object_id parameterMichael Haggerty2015-05-251-1/+3
|/
* ref_transaction_update(): remove "have_old" parameterMichael Haggerty2015-02-171-1/+1
* refs.c: pass the ref log message to _create/delete/update instead of _commitRonnie Sahlberg2014-10-151-2/+3
* Merge branch 'rs/ref-transaction-1'Junio C Hamano2014-09-111-6/+8
|\
| * replace.c: use the ref transaction functions for updatesRonnie Sahlberg2014-09-031-6/+8
* | run-command: introduce CHILD_PROCESS_INITRené Scharfe2014-08-201-2/+2
* | Merge branch 'cc/replace-graft'Junio C Hamano2014-07-271-1/+125
|\ \
| * | replace: check mergetags when using --graftChristian Couder2014-07-211-0/+47
| * | replace: remove signature when using --graftChristian Couder2014-07-211-0/+5
| * | replace: add --graft optionChristian Couder2014-07-211-1/+73
| |/
* | replace: add a --raw mode for --editjk/replace-edit-rawJeff King2014-06-251-10/+21
* | replace: use argv_array in export_objectcc/replace-editJeff King2014-06-251-3/+5
* | avoid double close of descriptors handed to run_commandJeff King2014-06-251-2/+0
* | replace: replace spaces with tabs in indentationJeff King2014-06-251-3/+3
|/
* replace: add --edit to usage stringChristian Couder2014-05-191-0/+1
* replace: die early if replace ref already existsChristian Couder2014-05-191-1/+4
* replace: refactor checking ref validityChristian Couder2014-05-191-11/+20
* replace: make sure --edit results in a different objectChristian Couder2014-05-191-0/+3
* replace: add --edit optionJeff King2014-04-291-1/+111
* replace: factor object resolution out of replace_objectJeff King2014-04-291-8/+18
* replace: use OPT_CMDMODE to handle modesJeff King2014-04-291-24/+25
* replace: refactor command-mode determinationJeff King2014-04-291-8/+6
* Merge branch 'mh/replace-refs-variable-rename'Junio C Hamano2014-03-141-1/+1
|\
| * rename read_replace_refs to check_replace_refsMichael Haggerty2014-02-201-1/+1
* | use wildmatch() directly without fnmatch() wrapperNguyễn Thái Ngọc Duy2014-02-201-1/+1
|/
* replace info: rename 'full' to 'long' and clarify in-code symbolscc/replace-object-infoChristian Couder2013-12-301-10/+14
* builtin/replace: unset read_replace_refsChristian Couder2013-12-121-0/+2
* builtin/replace: teach listing using short, medium or full formatsChristian Couder2013-12-121-7/+54
* Merge branch 'cc/replace-with-the-same-type'Jonathan Nieder2013-09-241-3/+13
|\
| * replace: allow long option namesChristian Couder2013-09-061-3/+3
| * replace: forbid replacing an object with one of a different typeChristian Couder2013-09-061-0/+10
* | Merge branch 'bk/refs-multi-update'Junio C Hamano2013-09-201-1/+1
|\ \
| * | refs: report ref type from lock_any_ref_for_updateBrad King2013-08-301-1/+1
| |/
* | Replace deprecated OPT_BOOLEAN by OPT_BOOLStefan Beller2013-08-051-3/+3
|/
* fix "builtin-*" references to be "builtin/*"Phil Hord2013-06-181-1/+1
* replace: parse revision argument for -dMichael J Gruber2012-11-131-6/+9
* i18n: replace: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-201-6/+6
* Convert many resolve_ref() calls to read_ref*() and ref_exists()Nguyễn Thái Ngọc Duy2011-11-131-2/+2
* Change check_ref_format() to take a flags argumentMichael Haggerty2011-10-051-1/+1
* Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds2010-02-221-0/+159
View Lorry Controller Status