summaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bc/maint-status-z-to-use-porcelain'Junio C Hamano2011-06-061-3/+4
* Merge branch 'jk/format-patch-am'Junio C Hamano2011-05-318-28/+25
|\
| * format-patch: preserve subject newlines with -kJeff King2011-05-261-0/+1
| * clean up calling conventions for pretty.c functionsJeff King2011-05-264-13/+17
| * pretty: add pp_commit_easy function for simple callersJeff King2011-05-265-12/+5
| * mailinfo: always clean up rfc822 header foldingJeff King2011-05-261-1/+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
* | | Merge branch 'jk/maint-remote-mirror-safer'Junio C Hamano2011-05-311-2/+2
|\ \ \
| * | | remote: allow "-t" with fetch mirrorsJeff King2011-05-261-2/+2
* | | | Merge branch 'jl/read-tree-m-dry-run'Junio C Hamano2011-05-311-1/+2
|\ \ \ \
| * | | | Teach read-tree the -n|--dry-run optionJens Lehmann2011-05-251-1/+2
* | | | | Merge branch 'mk/grep-pcre'Junio C Hamano2011-05-301-9/+43
|\ \ \ \ \
| * | | | | git-grep: do not die upon -F/-P when grep.extendedRegexp is set.Junio C Hamano2011-05-091-13/+43
| * | | | | git-grep: Bail out when -P is used with -F or -EMichał Kiedrowicz2011-05-091-1/+3
| * | | | | git-grep: Learn PCREMichał Kiedrowicz2011-05-091-0/+2
* | | | | | Merge branch 'jc/notes-batch-removal'Junio C Hamano2011-05-292-22/+43
|\ \ \ \ \ \
| * | | | | | show: --ignore-missingJunio C Hamano2011-05-191-0/+1
| * | | | | | notes remove: --stdin reads from the standard inputJunio C Hamano2011-05-191-4/+15
| * | | | | | notes remove: --ignore-missingJunio C Hamano2011-05-191-4/+10
| * | | | | | notes remove: allow removing more than oneJunio C Hamano2011-05-191-22/+25
* | | | | | | Merge branch 'jk/haves-from-alternate-odb'Junio C Hamano2011-05-292-4/+14
|\ \ \ \ \ \ \
| * | | | | | | receive-pack: eliminate duplicate .have refsJeff King2011-05-191-3/+13
| * | | | | | | refactor refs_from_alternate_cb to allow passing extra dataJeff King2011-05-192-2/+2
* | | | | | | | Merge branch 'jk/fetch-mark-complete-optimization'Junio C Hamano2011-05-261-2/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | fetch: avoid repeated commits in mark_completeJeff King2011-05-191-2/+4
| |/ / / / / / /
* | | | | | | | Merge branch 'jc/bigfile'Junio C Hamano2011-05-252-2/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | index_fd(): turn write_object and format_check arguments into one flagJunio C Hamano2011-05-092-2/+6
* | | | | | | | | Merge branch 'js/log-abbrev-commit-config'Junio C Hamano2011-05-251-9/+18
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add log.abbrevCommit config variableJay Soffian2011-05-181-8/+17
| * | | | | | | | | "git log -h": typofix misspelled 'suppress'Jay Soffian2011-05-181-1/+1
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'maint'Junio C Hamano2011-05-252-2/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | init/clone: remove short option -L and document --separate-git-dirNguyen Thai Ngoc Duy2011-05-252-2/+2
| | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge branch 'vr/merge-base-doc' into maintJunio C Hamano2011-05-161-1/+2
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jc/fix-add-u-unmerged' into maintJunio C Hamano2011-05-161-22/+23
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Merge branch 'jc/maint-branch-mergeoptions' into maintJunio C Hamano2011-05-161-15/+26
| * | | | | | | | | Merge branch 'jc/maint-add-p-overlapping-hunks' into maintJunio C Hamano2011-05-161-3/+6
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge branch 'ms/ls-remote-exit-with-status'Junio C Hamano2011-05-231-2/+9
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | ls-remote: the --exit-code option reports "no matching refs"Michael Schubert2011-05-181-2/+9
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'mg/config-symbolic-constants'Junio C Hamano2011-05-231-1/+6
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | config: Give error message when not changing a multivarMichael J Gruber2011-05-171-1/+6
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'jc/magic-pathspec'Junio C Hamano2011-05-231-7/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | grep: use get_pathspec() correctlyJunio C Hamano2011-05-101-7/+1
* | | | | | | | | | | | Merge branch 'jk/blame-line-porcelain'Junio C Hamano2011-05-231-10/+23
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | blame: add --line-porcelain output formatJeff King2011-05-091-2/+8
| * | | | | | | | | | | | blame: refactor porcelain outputJeff King2011-05-091-9/+16
* | | | | | | | | | | | | Merge branch 'jc/replacing'Junio C Hamano2011-05-191-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | read_sha1_file(): get rid of read_sha1_file_repl() madnessJunio C Hamano2011-05-151-2/+2
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'ms/tagname-does-not-begin-with-dash'Junio C Hamano2011-05-191-8/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | tag: disallow '-' as tag nameMichael Schubert2011-05-101-8/+18
| | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |