git 合并no branch 到 master
* (no branch) masterxx@linux-008:~/workspace/s3c-linux> git checkout master
Previous HEAD position was cd1b219... solve 'WARNING: modpost: Found 4 section mismatch(es)'
Switched to branch 'master'
xx@linux-008:~/workspace/s3c-linux> git merge cd1b219
Updating 2fd8a90..cd1b219
Fast-forward
arch/arm/mach-s3c2416/dma.c | 4 +-
arch/arm/mach-s3c2416/irq.c | 2 +-
drivers/input/keyboard/helper2416_keys.c | 58 +-----------------------------
drivers/video/s3cfb.c | 4 +-
4 files changed, 6 insertions(+), 62 deletions(-)
xx@linux-008:~/workspace/s3c-linux> git push origin master
Counting objects: 28, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (16/16), done.
Writing objects: 100% (16/16), 1.35 KiB, done.
Total 16 (delta 14), reused 0 (delta 0)
To git@192.168.0.101:s3c-linux.git
2fd8a90..cd1b219master -> master
xx@linux-008:~/workspace/s3c-linux> git branch
* master
转载请注明出处
页:
[1]