You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
|
|
┏┳┓┏━╸┏━┓┏━╸╻┏┓╻┏━╸ ┏━╸┏━╸ ┃┃┃┣╸ ┣┳┛┃╺┓┃┃┗┫┃╺┓ ╺━╸ ┣╸ ┣╸ ╹ ╹┗━╸╹┗╸┗━┛╹╹ ╹┗━┛ ╹ ╹
- _fast-forward_ merge possible if HEAD direct ancestor - This allows for a clean, linear history on stable branches - helps with git blame, git bisect, git rebase -i
┌─────────────────────────────────────────────────────────────┐ │[spranger@gitWorkshop/stagingArea] git merge more_int_changes│ │Updating eff74ed..a2c365a │ │Fast-forward │ │ testfile1 | 4 ++-- │ │ 1 file changed, 2 insertions(+), 2 deletions(-) │ └─────────────────────────────────────────────────────────────┘
- --ff, --no-ff, --ff-only
|
