Warning: You are not logged in. Your IP address will be publicly visible if you make any edits. If you
log in or
create an account, your edits will be attributed to your username, along with other benefits.
The edit can be undone.
Please check the comparison below to verify that this is what you want to do, and then publish the changes below to finish undoing the edit.
Latest revision |
Your text |
Line 24: |
Line 24: |
| === username/email === | | === username/email === |
| [http://alvinalexander.com/git/git-show-change-username-email-address How to show or change your Git username or email address] | | [http://alvinalexander.com/git/git-show-change-username-email-address How to show or change your Git username or email address] |
|
| |
| === mergetool ===
| |
| Das einem am sympatischsten erscheinende merging tool in git einrichten:
| |
| git config --global merge.tool meld
| |
| und den aktuellen konflikt mit
| |
| git mergetool
| |
| beheben.
| |
|
| |
| {| class="wikitable sortable"
| |
| |-
| |
| ! name+url !! license !! used by
| |
| |-
| |
| | [http://meldmerge.org/ meld] || GPLv2 || {{U|bison}}
| |
| |-
| |
| |}
| |
|
| |
| Andere diff-tools:
| |
|
| |
| vimdiff, meld, opendiff, kdiff3, tkdiff, xxdiff, tortoisemerge, gvimdiff, diffuse, ecmerge, p4merge, araxis, vimdiff, emerge, bc3 (Beyond Compare 3)
| |
|
| |
|
| === README.md === | | === README.md === |