GIT (Windows): Unterschied zwischen den Versionen
Zur Navigation springen
Zur Suche springen
| (4 dazwischenliegende Versionen desselben Benutzers werden nicht angezeigt) | |||
| Zeile 4: | Zeile 4: | ||
== Merge Tools == | == Merge Tools == | ||
=== Allgemein === | |||
Aufruf der nachfolgenden Programme erfolgt mittels: | |||
<pre> | |||
git mergetool | |||
</pre> | |||
=== Meld === | === Meld === | ||
| Zeile 31: | Zeile 39: | ||
[https://stackoverflow.com/questions/14821358/git-mergetool-with-meld-on-windows https://stackoverflow.com/questions/14821358/git-mergetool-with-meld-on-windows] | [https://stackoverflow.com/questions/14821358/git-mergetool-with-meld-on-windows https://stackoverflow.com/questions/14821358/git-mergetool-with-meld-on-windows] | ||
=== vimdiff === | |||
==== Installation ==== | |||
[https://superuser.com/questions/560519/how-to-set-an-alias-in-windows-command-line https://superuser.com/questions/560519/how-to-set-an-alias-in-windows-command-line] | |||
==== Links ==== | |||
[https://www.rosipov.com/blog/use-vimdiff-as-git-mergetool/ https://www.rosipov.com/blog/use-vimdiff-as-git-mergetool/] | |||
[https://github.com/tpope/vim-fugitive https://github.com/tpope/vim-fugitive] | |||
[http://vimcasts.org/episodes/fugitive-vim---a-complement-to-command-line-git/ http://vimcasts.org/episodes/fugitive-vim---a-complement-to-command-line-git/] | |||
Zurück zu [[Windows#Programme|Windows]] | Zurück zu [[Windows#Programme|Windows]] | ||
Aktuelle Version vom 10. Juni 2019, 13:25 Uhr
Git Installation
Merge Tools
Allgemein
Aufruf der nachfolgenden Programme erfolgt mittels:
git mergetool
Meld
Installation
Installer von https://download.gnome.org/binaries/win32/meld/ herunterladen und ausführen.
Konfiguration
Meld als Merge-Tool für GIT festlegen:
git config --global merge.tool meld git config --global diff.tool meld
GIT den Installationspfad für Meld mitteilen:
git config --global mergetool.meld.path "C:\Program Files (x86)\Meld\Meld.exe"
Pfad der Konfigurationsdatei befindet sich in C:\Users\<user>\.gitconfig
Links
https://stackoverflow.com/questions/14821358/git-mergetool-with-meld-on-windows
vimdiff
Installation
https://superuser.com/questions/560519/how-to-set-an-alias-in-windows-command-line
Links
https://www.rosipov.com/blog/use-vimdiff-as-git-mergetool/
https://github.com/tpope/vim-fugitive
http://vimcasts.org/episodes/fugitive-vim---a-complement-to-command-line-git/
Zurück zu Windows