There is also 日本語 translation.
Consider creating a pull request, which merge the branch named pull-request into master branch.
This commit graph is generated by tig command (tig master pull-request).
(On Windows, I recommend Sourcetree to generate commit graphs.)
When merging the pull request, there are three options:
After merging, the commit graphs will be look like these:
Note that the commit authors (charles and donald) have been replaced with the merger (wataash).
git show --pretty=full squash-and-merge:
commit decb2967fed0c8bf776055abdeeb70db5c4680e3 (origin/squash-and-merge, squash-and-merge)
Author: Wataru Ashihara <[email protected]>
Commit: GitHub <[email protected]>
Try "Squash and merge" (#2)
* commit C
* commit D
diff --git a/c.txt b/c.txt
new file mode 100644
index 0000000..e69de29
diff --git a/d.txt b/d.txt
new file mode 100644
index 0000000..e69de29
When merging by "Squash and merge", the author will be the merger and the committer will be "GitHub".
Personally I don't prefer "Squash and merge" since the contributions, which can be seen in "Insights", seems to be lost. If you want to squash commits, I recommend using git rebase --interactive
Though the authors are not changed, the committer are changed to GitHub Name <[email protected]>. git log --pretty=full -2 rebase-and-merge:
commit 24c02be4250587e26ded87f84ba157414593f35f (origin/rebase-and-merge, rebase-and-merge)
Author: Donald Dijkstra <[email protected]>
Commit: Wataru Ashihara <[email protected]>
commit D
commit 6fa84589a2af5f3234d647a097046f4e7847c420
Author: Charles Codd <[email protected]>
Commit: Wataru Ashihara <[email protected]>
commit C
To get grasp of the commit-graph status, always use a visualizing tool (tig --all Sourcetree, SmartGit or so on).