diff options
author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-11-08 00:33:19 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2007-11-07 17:05:53 -0800 |
commit | 6d0618a820a20846d60b665897fcce600f452eec (patch) | |
tree | 8a8cb4f9106fd8e188f0e225c60cd87b15fe8a36 /Documentation/merge-strategies.txt | |
parent | When exec() fails include the failing command in the error message (diff) | |
download | tgif-6d0618a820a20846d60b665897fcce600f452eec.tar.xz |
Add Documentation/CodingGuidelines
Even if our code is quite a good documentation for our coding style,
some people seem to prefer a document describing it.
The part about the shell scripts is clearly just copied from one of
Junio's helpful mails, and some parts were added from comments by
Junio, Andreas Ericsson and Robin Rosenberg.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions