diff options
| author | Peter Palfrader <peter@palfrader.org> | 2009-07-16 21:02:37 +0000 |
|---|---|---|
| committer | weasel <weasel@bc3d92e2-beff-0310-a7cd-cc87d7ac0ede> | 2009-07-16 21:02:37 +0000 |
| commit | 33b0018457db0bd965b906d6fc2963a1f7facedc (patch) | |
| tree | 66579617a2500a626f0ec96cb7f0ad15b4daaf94 /gitconfig | |
| parent | ab8c169a9a13cafd39570531c86f0cd1f8ee6bc5 (diff) | |
update gitconfig and add to link-them
git-svn-id: svn+ssh://asteria.noreply.org/svn/weaselutils/trunk@404 bc3d92e2-beff-0310-a7cd-cc87d7ac0ede
Diffstat (limited to 'gitconfig')
| -rw-r--r-- | gitconfig | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -4,6 +4,7 @@ [alias] st = status ci = commit + co = checkout [color] diff = auto status = auto @@ -12,3 +13,7 @@ sslCAPath = /etc/ssl/certs [merge] summary = true +[branch "debian-merge"] + mergeoptions = --no-ff --no-commit +[branch "debian"] + mergeoptions = --no-ff --no-commit |