помогите пожалуйста разобраться с одним моментом
в git обычно при добавлении нового коммита текущая ветка передвигается вместе с указателем HEAD на новую позицию. но иногда случается так, что указатель HEAD передвинулся на новую позицию, а указатель master остался на месте:
(shoptest_env)kalinin@kalinin ~/.virtualenvs/shoptest_project/shoptest $ git hist
* 40c9f5b 2014-12-04 | werwrwer erwrwerwer werwerwer fdgdfgd 2423 (HEAD, master) [Your Name]
* ced79dc 2014-12-04 | uuuuuuu [Your Name]
* 34ddfa1 2014-12-04 | new [Your Name]
* e4f1b3a 2014-12-04 | cart override (origin/master) [Your Name]
* 7a39c37 2014-12-04 | detail4 [Your Name]
* 19554f3 2014-12-04 | detail3 [Your Name]
* d0d0f7b 2014-12-04 | detail2 [Your Name]
* 173f27f 2014-12-04 | detail [Your Name]
* 677c95b 2014-12-03 | custom product page compl [Your Name]
* 10f7724 2014-12-03 | shop ok [Your Name]
* 7f580a3 2014-12-03 | first commit django install [Your Name]
(shoptest_env)kalinin@kalinin ~/.virtualenvs/shoptest_project/shoptest $ git add .
(shoptest_env)kalinin@kalinin ~/.virtualenvs/shoptest_project/shoptest $ git ci -m 'rem'
[detached HEAD d1d6673] rem
1 file changed, 1 insertion(+)
create mode 100644 test
(shoptest_env)kalinin@kalinin ~/.virtualenvs/shoptest_project/shoptest $ git hist
* d1d6673 2014-12-05 | rem (HEAD) [Your Name]
* 40c9f5b 2014-12-04 | werwrwer erwrwerwer werwerwer fdgdfgd 2423 (master) [Your Name]
* ced79dc 2014-12-04 | uuuuuuu [Your Name]
* 34ddfa1 2014-12-04 | new [Your Name]
* e4f1b3a 2014-12-04 | cart override (origin/master) [Your Name]
* 7a39c37 2014-12-04 | detail4 [Your Name]
* 19554f3 2014-12-04 | detail3 [Your Name]
* d0d0f7b 2014-12-04 | detail2 [Your Name]
* 173f27f 2014-12-04 | detail [Your Name]
* 677c95b 2014-12-03 | custom product page compl [Your Name]
* 10f7724 2014-12-03 | shop ok [Your Name]
* 7f580a3 2014-12-03 | first commit django install [Your Name]
не могу понять почему так происходит
при этом слить ветки следующим образом не получается:
(shoptest_env)kalinin@kalinin ~/.virtualenvs/shoptest_project/shoptest $ git merge master
Already up-to-date.
(shoptest_env)kalinin@kalinin ~/.virtualenvs/shoptest_project/shoptest $ git hist
* d1d6673 2014-12-05 | rem (HEAD) [Your Name]
* 40c9f5b 2014-12-04 | werwrwer erwrwerwer werwerwer fdgdfgd 2423 (master) [Your Name]
* ced79dc 2014-12-04 | uuuuuuu [Your Name]
* 34ddfa1 2014-12-04 | new [Your Name]
* e4f1b3a 2014-12-04 | cart override (origin/master) [Your Name]
* 7a39c37 2014-12-04 | detail4 [Your Name]
* 19554f3 2014-12-04 | detail3 [Your Name]
* d0d0f7b 2014-12-04 | detail2 [Your Name]
* 173f27f 2014-12-04 | detail [Your Name]
* 677c95b 2014-12-03 | custom product page compl [Your Name]
* 10f7724 2014-12-03 | shop ok [Your Name]
* 7f580a3 2014-12-03 | first commit django install [Your Name]
