summaryrefslogtreecommitdiff
path: root/builtin/log.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/format-patch-am'Junio C Hamano2011-05-311-12/+13
|\
| * format-patch: preserve subject newlines with -kJeff King2011-05-261-0/+1
| * clean up calling conventions for pretty.c functionsJeff King2011-05-261-10/+11
| * pretty: add pp_commit_easy function for simple callersJeff King2011-05-261-3/+1
* | Merge branch 'jc/log-quiet-fix'Junio C Hamano2011-05-311-0/+2
|\ \
| * | log: --quiet should serve as synonym to -sJunio C Hamano2011-05-281-0/+2
* | | Add log.abbrevCommit config variableJay Soffian2011-05-181-8/+17
* | | "git log -h": typofix misspelled 'suppress'Jay Soffian2011-05-181-1/+1
* | | Merge branch 'cn/log-parse-opt'Junio C Hamano2011-05-131-30/+44
|\ \ \ | |/ /
| * | log: convert to parse-optionsCarlos Martín Nieto2011-04-141-30/+43
| * | Merge branch 'mm/maint-log-n-with-diff-filtering' into maintJunio C Hamano2011-04-031-1/+7
| |\ \
* | \ \ Merge branch 'nd/struct-pathspec'Junio C Hamano2011-05-061-1/+3
|\ \ \ \
| * | | | Convert read_tree{,_recursive} to support struct pathspecNguyễn Thái Ngọc Duy2011-03-251-1/+3
* | | | | Merge branch 'jc/rename-degrade-cc-to-c'Junio C Hamano2011-04-281-0/+9
|\ \ \ \ \
| * | | | | diffcore-rename: fall back to -C when -C -C busts the rename limitJunio C Hamano2011-03-221-0/+9
* | | | | | Merge branch 'cn/format-patch-quiet'Junio C Hamano2011-04-271-6/+10
|\ \ \ \ \ \
| * | | | | | format-patch: don't pass on the --quiet flagCarlos Martín Nieto2011-04-121-6/+10
* | | | | | | Merge branch 'mg/reflog-with-options'Junio C Hamano2011-04-271-13/+17
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | reflog: fix overriding of command line optionsMichael J Gruber2011-04-011-7/+2
| * | | | | | builtin/log.c: separate default and setup of cmd_log_init()Michael J Gruber2011-04-011-6/+15
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'ab/i18n-st'Junio C Hamano2011-04-011-34/+34
|\ \ \ \ \ \
| * | | | | | i18n: git-log "--OPT does not make sense" messagesÆvar Arnfjörð Bjarmason2011-03-091-3/+3
| * | | | | | i18n: git-log basic messagesÆvar Arnfjörð Bjarmason2011-03-091-31/+31
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'mg/rev-list-n-parents'Junio C Hamano2011-03-261-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | revision.c: introduce --min-parents and --max-parents optionsMichael J Gruber2011-03-231-1/+1
| |/ / / /
* | | | | Merge branch 'mm/maint-log-n-with-diff-filtering'Junio C Hamano2011-03-191-1/+7
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | log: fix --max-count when used together with -S or -GMatthieu Moy2011-03-091-1/+7
| |/ / /
* | | | Merge branch 'maint'Junio C Hamano2011-03-161-16/+18
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | cherry: split off function to print output linesJonathan Nieder2011-03-161-16/+18
| |/
* | Convert struct diff_options to use struct pathspecNguyễn Thái Ngọc Duy2011-02-031-1/+1
|/
* Merge branch 'tc/format-patch-p'Junio C Hamano2010-12-121-0/+2
|\
| * format-patch: page output with --stdoutTay Ray Chuan2010-11-231-0/+2
* | Merge branch 'pn/commit-autosquash'Junio C Hamano2010-12-031-2/+1
|\ \
| * | commit: helper methods to reduce redundant blocks of codePat Notz2010-11-041-2/+1
| |/
* | add description parameter to OPT__VERBOSERené Scharfe2010-11-151-1/+1
|/
* Merge branch 'rr/format-patch-count-without-merges'Junio C Hamano2010-09-291-6/+1
|\
| * format-patch: Don't go over merge commitsRamkumar Ramachandra2010-08-271-6/+1
* | Fix 'git log' early pager startup error caseLinus Torvalds2010-08-251-6/+1
* | Merge branch 'ar/decorate-color'Junio C Hamano2010-06-301-0/+3
|\ \
| * | Allow customizable commit decorations colorsNazri Ramliy2010-06-241-0/+3
* | | Merge branch 'jp/string-list-api-cleanup'Junio C Hamano2010-06-301-10/+10
|\ \ \
| * | | string_list: Fix argument order for string_list_appendJulian Phillips2010-06-271-10/+10
| |/ /
* | | format-patch: Add a signature option (--signature)Stephen Boyd2010-06-161-3/+15
|/ /
* | Merge branch 'sd/log-decorate'Junio C Hamano2010-05-081-6/+40
|/
* pretty: Initialize notes if %N is usedJohannes Gilger2010-04-131-1/+5
* Merge branch 'ef/cherry-abbrev'Junio C Hamano2010-04-031-18/+21
|\
| * cherry: support --abbrev optionErik Faye-Lund2010-03-211-18/+21
* | Merge branch 'maint'Junio C Hamano2010-03-291-1/+8
* | Merge branch 'tr/notes-display'Junio C Hamano2010-03-241-0/+5
* | Merge branch 'pb/log-first-parent-p-m'Junio C Hamano2010-03-241-11/+38
|/