]> git.madduck.net Git - code/vcsh.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Merge remote-tracking branch 'Dieter_be/master'
authorRichard Hartmann <richih.mailinglist@gmail.com>
Sat, 26 Nov 2011 22:32:52 +0000 (23:32 +0100)
committerRichard Hartmann <richih.mailinglist@gmail.com>
Sat, 26 Nov 2011 22:32:52 +0000 (23:32 +0100)
Conflicts:
doc/error_codes.md

1  2 
doc/error_codes.md

diff --combined doc/error_codes.md
index 008d4a1abe2979afbce5ce35f9d61b6f55c9200d,a6cc903b8c32341797bed5a9b2885e1ccbe6acd2..e127e7d6e7d85f9ffa9bd7207446dfd8b22add99
@@@ -4,6 -4,8 +4,6 @@@
  * 11: Could not enter $GIT_WORK_TREE
  * 12: No repository found
  * 13: Required directory exists but is not a directory
 -* 14: Could not create directory
 -* 15: Could not create file
  * 16: Potentially harmful operation aborted
  * 17: Files that would be overwritten exist; fix manually
  
  * 51: Could not create file
  * 52: Could not move directory
  * 53: Could not move file
- * 99: Error code reserved for actions that should never happen
 +* 54: Directory exists
 +* 55: File exists
 +* 56: 
 +* 57: Could not write to file
 +* 57: Could not delete directory
 +* 59: Could not delete file