mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge remote-tracking branch 'branchable/master'

Browse source
This commit is contained in:
Joey Hess 2011-03-12 15:42:23 -04:00
commit 8fa4b48fc4
1 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
doc/bugs/git_rename_detection_on_file_move/comment_1_0531dcfa833b0321a7009526efe3df33._comment Normal file
View file

@ -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).
"""]]