Code

Merge branch 'sb/maint-1.6.0-add-config-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Jun 2009 07:44:09 +0000 (00:44 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Jun 2009 07:44:09 +0000 (00:44 -0700)
commitd1f6c18bd6ea5fd373f9f6356e02854678ffa0fd
tree41b6b3d3fb71765f6e6223e35873edaaffb9bff5
parentcff4231a1dfbe68b4a163b31406d862567d3243a
parented342fdea0b7fd466ed3257c5e68aa81c391b782
Merge branch 'sb/maint-1.6.0-add-config-fix' into maint

* sb/maint-1.6.0-add-config-fix:
  add: allow configurations to be overriden by command line
builtin-add.c
t/t3700-add.sh