Git - GitHub - Collaborating with Git - Part Ⅰ: Remote Work - subcommand, merge
Head First Git: A Learner’s Guide to Understanding Git from the Inside Out、 Raju Gandhi(著)、 O’Reilly Mediaの Chapter 5.(Collaborating with Git - Part Ⅰ: Remote Work)、SHARPEN YOUR PENCIL(407/715)の解答を求めてみる。
入出力結果(Terminal, Zsh)
% git status
On branch master
Your branch is ahead of 'origin/master' by 1 commit.
(use "git push" to publish your local commits)
nothing to commit, working tree clean
% git branch
feat-a
* master
% git merge feat-a
Merge made by the 'ort' strategy.
feat-a-01.md | 1 +
1 file changed, 1 insertion(+)
create mode 100644 feat-a-01.md
% git log --oneline --all --graph
* 3a6625a (HEAD -> master) Merge branch 'feat-a'
|\
| * 76d6cd5 (feat-a) my first commit on feat-a
* | c0e9aa0 my second commit on master
|/
* 177e981 (origin/master, origin/HEAD) my first commit on master
* 5aefc0d add master-01 file
* f9fd4aa add README
% git push
Enumerating objects: 9, done.
Counting objects: 100% (9/9), done.
Delta compression using up to 8 threads
Compressing objects: 100% (6/6), done.
Writing objects: 100% (8/8), 815 bytes | 815.00 KiB/s, done.
Total 8 (delta 2), reused 0 (delta 0), pack-reused 0 (from 0)
remote: Resolving deltas: 100% (2/2), done.
To https://github.com/kamimura/working-with-remotes.git
177e981..3a6625a master -> master
%