Many Git commands started out like that, and a few are still scripts. Many git commands started out like + changed and discussed. 164,14 +165,14 If you are planning a new command, consider writing it in shell or perl first, so that changes in semantics can be easily - changed and discussed. That means that you should not use C99 initializers, even if a lot of compilers grok it. We try to support a wide range of C compilers to compile git with, + - We try to support a wide range of C compilers to compile Git with, including old ones. 112,7 +113,7 We try to keep to at most 80 characters per line.
#Araxis merge sourcetree .gitconfig code#
Modifications to existing code is expected to match the style the surrounding code already uses (even if it doesn't match the overall style of existing code). New code added to Git suite is expected to match the overall style of existing code. New code added to git suite is expected to match +convention. It is always preferable to match the _local_ -convention. As for more concrete guidelines, just imitate the existing code (this is a good guideline, no matter which project you are contributing to). +Make your code readable and sensible, and don't try to be clever. For Git in general, three rough rules are: - Most importantly, we never say "It's in POSIX we'll happily ignore your needs should your system not conform to it." -18,11 +18,12 call, the decision based more on real world constraints people face than what the paper standard says. For git in general, three rough rules are: +code. +++ -1,5 +1,5 other projects, we also have some guidelines to keep to the -code. +++ -9,4 +9,5 doc.dep cmds-*.txt +mergetools-*.txt manpage-base-url.xsl diff -git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines +++ -73,6 +73,7 Peter Krefting Peter Krefting +Petr Baudis Philippe Bruhat Ralf Thielow Ramsay Allan Jones diff -git a/Documentation/.gitignore b/Documentation/.gitignore
+++ -1,7 +1,6 /GIT-CFLAGS /GIT-LDFLAGS -/GIT-GUI-VARS /GIT-PREFIX /GIT-PYTHON-VARS /GIT-SCRIPT-DEFINES -23,6 +22,7 /git-cat-file /git-check-attr +/git-check-ignore /git-check-ref-format /git-checkout /git-checkout-index -125,7 +125,7 /git-remote-fd /git-remote-ext -/git-remote-testgit +/git-remote-testpy /git-remote-testsvn /git-repack /git-replace -172,7 +172,6 /git-write-tree /git-core-*/?* -/gitk-git/gitk-wish /gitweb/GITWEB-BUILD-OPTIONS /gitweb/gitweb.cgi /gitweb/static/gitweb.js -199,6 +198,7 /test-subprocess /test-svn-fe +/test-wildmatch /common-cmds.h *.tar.gz *.dsc diff -git a/.mailmap b/.mailmap Receive-pack: close sideband fd on early pack errors * jk/receive-pack-deadlocks-with-early-failure: Returned without closing the error stream, which led to a hang Order to decide which of unpack-objects or index-pack to run, it When receive-pack detects error in the pack header it received in Merge branch 'jk/receive-pack-deadlocks-with-early-failure'