git/Documentation/git-replace.txt, branch v2.13.2

doc: change environment variables format

2016-06-08T19:04:37Z

This change GIT_* variables that where in italic style to monospaced font according to the guideline. It was obtained with perl -pi -e "s/\'(GIT_.*?)\'/\`\1\`/g" *.txt One of the main purposes is to stick to the CodingGuidelines as possible so that people writting new documentation by mimicking the existing are more likely to have it right (even if they didn't read the CodingGuidelines). Signed-off-by: Tom Russello Signed-off-by: Erwan Mathoniere Signed-off-by: Samuel Groot Signed-off-by: Matthieu Moy Reviewed-by: Matthieu Moy Signed-off-by: Junio C Hamano

Merge branch 'cc/replace-graft'

2014-07-27T22:14:18Z

"git replace" learned a "--graft" option to rewrite parents of a commit. * cc/replace-graft: replace: add test for --graft with a mergetag replace: check mergetags when using --graft replace: add test for --graft with signed commit replace: remove signature when using --graft contrib: add convert-grafts-to-replace-refs.sh Documentation: replace: add --graft option replace: add test for --graft replace: add --graft option replace: cleanup redirection style in tests

contrib: add convert-grafts-to-replace-refs.sh

2014-07-21T19:05:53Z

This patch adds into contrib/ an example script to convert grafts from an existing grafts file into replace refs using the new --graft option of "git replace". While at it let's mention this new script in the "git replace" documentation for the --graft option. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano

Documentation: replace: add --graft option

2014-07-21T19:05:47Z

Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano

replace: add a --raw mode for --edit

2014-06-25T22:28:28Z

One of the purposes of "git replace --edit" is to help a user repair objects which are malformed or corrupted. Usually we pretty-print trees with "ls-tree", which is much easier to work with than the raw binary data. However, some forms of corruption break the tree-walker, in which case our pretty-printing fails, rendering "--edit" useless for the user. This patch introduces a "--raw" option, which lets you edit the binary data in these instances. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Documentation: replace: describe new --edit option

2014-05-19T20:39:54Z

Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano

replace info: rename 'full' to 'long' and clarify in-code symbols

2013-12-30T20:33:11Z

Enum names SHORT/MEDIUM/FULL were too broad to be descriptive. And they clashed with built-in symbols on platforms like Windows. Clarify by giving them REPLACE_FORMAT_ prefix. Rename 'full' format in "git replace --format=" to 'long', to match others (i.e. 'short' and 'medium'). Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano

Documentation/git-replace: describe --format option

2013-12-12T19:53:49Z

Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano

Doc: 'replace' merge and non-merge commits

2013-09-09T15:16:30Z

Merges are often treated as special case objects so tell users that they are not special here. Signed-off-by: Philip Oakley Signed-off-by: Junio C Hamano

replace: allow long option names

2013-09-06T20:32:24Z

It is now standard practice in Git to have both short and long option names. So let's give a long option name to the git replace options too. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano