]> rtime.felk.cvut.cz Git - git.git/commit
projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e251a7b 4f62c2b)
Merge branch 'sd/log-decorate'
authorJunio C Hamano <gitster@pobox.com>
Sun, 9 May 2010 05:36:14 +0000 (22:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 9 May 2010 05:36:14 +0000 (22:36 -0700)
commit72d9b222a940c93a8d915c26a4d5d077e23be871
treeb1bfaf4991ee3edf1410ef4e5dff3a5475746795tree | snapshot
parente251a7b34a85b0ac8a63a31e899e070ea2a330c7commit | diff
parent4f62c2bc577bbb85b65f3261c7fab7ef74def4cdcommit | diff
Merge branch 'sd/log-decorate'

* sd/log-decorate:
  log.decorate: only ignore it under "log --pretty=raw"
  script with rev-list instead of log
  log --pretty/--oneline: ignore log.decorate
  log.decorate: usability fixes
  Add `log.decorate' configuration variable.
  git_config_maybe_bool()

Conflicts:
builtin/log.c
Documentation/config.txt diff1 | diff2 | blob | history
Documentation/git-log.txt diff1 | diff2 | blob | history
builtin/log.c diff1 | diff2 | blob | history
cache.h diff1 | diff2 | blob | history
git-stash.sh diff1 | diff2 | blob | history
git-submodule.sh diff1 | diff2 | blob | history
Git mirror and local development