diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-03-12 15:42:23 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-03-12 15:42:23 -0400 |
| commit | 8fa4b48fc43667abfcaf13705e84a1efd1653478 (patch) | |
| tree | 4686accef4a8ee9b45778ea09c461d4eac16a9bd | |
| parent | cf6a13a05710e53a9a1b28b7474a5a31494349a8 (diff) | |
| parent | 4163341c9d09f92f4bd5dfb5d2f34538bee51bdb (diff) | |
Merge remote-tracking branch 'branchable/master'
| -rw-r--r-- | doc/bugs/git_rename_detection_on_file_move/comment_1_0531dcfa833b0321a7009526efe3df33._comment | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/doc/bugs/git_rename_detection_on_file_move/comment_1_0531dcfa833b0321a7009526efe3df33._comment b/doc/bugs/git_rename_detection_on_file_move/comment_1_0531dcfa833b0321a7009526efe3df33._comment new file mode 100644 index 000000000..8fec6bad7 --- /dev/null +++ b/doc/bugs/git_rename_detection_on_file_move/comment_1_0531dcfa833b0321a7009526efe3df33._comment @@ -0,0 +1,26 @@ +[[!comment format=mdwn + username="http://christian.amsuess.com/chrysn" + nickname="chrysn" + subject="use mini-branches" + date="2011-03-09T23:47:48Z" + content=""" +if you go for the two-commits version, small intermediate branches (or git-commit-tree) could be used to create a tree like this: + + + * commit 106eef2 + |\ Merge: 436e46f 9395665 + | | + | | the main commit + | | + | * commit 9395665 + |/ + | intermediate move + | + * commit 436e46f + | + | ... + +while the first commit (436e46f) has a \"`/subdir/foo → ../.git-annex/where_foo_is`\", the intermediate (9395665) has \"`/subdir/deeper/foo → ../.git-annex/where_foo_is`\", and the inal commit (106eef2) has \"`/subdir/deeper/foo → ../../.git-annex/where_foo_is`\". + +`--follow` uses the intermediate commit to find the history, but the intermediate commit would neither show up in `git log --first-parent` nor affect `git diff HEAD^..` & co. (there could still be confusion over `git show`, though). +"""]] |