Code

Merge branch 'mo/status-untracked'
authorJunio C Hamano <gitster@pobox.com>
Sun, 22 Jun 2008 21:32:27 +0000 (14:32 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 22 Jun 2008 21:32:27 +0000 (14:32 -0700)
commit1947bdbc31e8e1419bdfe90d2357c68919189c30
treedab40c45b1af3b48ea1fbe1c3d27317fd5e80af8
parent66915b5d7cc9b66bf8c452bb62c67da371c21d90
parentd6293d1f2cadcdf45f8ada7847a32b51fa5bf0a6
Merge branch 'mo/status-untracked'

* mo/status-untracked:
  Add configuration option for default untracked files mode
  Add argument 'no' commit/status option -u|--untracked-files
  Add an optional <mode> argument to commit/status -u|--untracked-files option

Conflicts:

Documentation/git-commit.txt
Documentation/git-commit.txt
builtin-commit.c