diff options
| author | René 'Necoro' Neumann <necoro@necoro.net> | 2012-10-12 15:35:26 +0200 |
|---|---|---|
| committer | René 'Necoro' Neumann <necoro@necoro.net> | 2012-10-12 15:35:26 +0200 |
| commit | f9c601213ef4941acb0b12624b8df81800be5a6b (patch) | |
| tree | e55ece8a2afd7c9256dcbd7b475ab0db2302fb53 | |
| parent | 6d1294d030836f5e9795635e39167a465c5186fd (diff) | |
| parent | 8d121c9a95142f3538f5c39d2511edf3dfb11d0c (diff) | |
| download | dotfiles-f9c601213ef4941acb0b12624b8df81800be5a6b.tar.gz dotfiles-f9c601213ef4941acb0b12624b8df81800be5a6b.tar.bz2 dotfiles-f9c601213ef4941acb0b12624b8df81800be5a6b.zip | |
Merge remote-tracking branch 'origin/master'
| -rw-r--r-- | .gitconfig | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -20,7 +20,7 @@ spull = svn rebase sfetch = svn fetch [push] - default = tracking + default = current [diff] rename = copy [core] |