aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'rs/grep-color'Junio C Hamano2011-06-29
|\
| * grep: add --headingRené Scharfe2011-06-05
| * grep: add --breakRené Scharfe2011-06-05
| * grep: fix coloring of hunk marks between filesRené Scharfe2011-06-05
* | Merge branch 'jc/maint-1.7.3-checkout-describe'Junio C Hamano2011-06-29
|\ \
| * | checkout -b <name>: correctly detect existing branchJunio C Hamano2011-06-05
* | | Merge branch 'jc/advice-about-to-lose-commit'Junio C Hamano2011-06-29
|\ \ \
| * | | checkout: make advice when reattaching the HEAD less loudJunio C Hamano2011-05-24
* | | | Merge branch 'maint-1.7.5' into maintJunio C Hamano2011-06-29
|\ \ \ \
| * | | | "branch -d" can remove more than one branchesJunio C Hamano2011-06-29
* | | | | plug a few coverity-spotted leaksJim Meyering2011-06-20
* | | | | Merge branch 'maint'Junio C Hamano2011-06-19
|\ \ \ \ \ | |/ / / /
| * | | | builtin/gc.c: add missing newline in messageAndreas Schwab2011-06-19
* | | | | Merge branch 'maint'Junio C Hamano2011-06-08
|\ \ \ \ \ | |/ / / /
| * | | | fetch: do not leak a refspecJim Meyering2011-06-08
| * | | | Merge branch 'ab/i18n-fixup' into maintJunio C Hamano2011-05-31
| |\ \ \ \
| * \ \ \ \ Merge branch 'jc/rename-degrade-cc-to-c' into maintJunio C Hamano2011-05-31
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/cherry-pick-root-with-resolve' into maintJunio C Hamano2011-05-26
| |\ \ \ \ \ \
| * | | | | | | Merge branch 'jk/git-connection-deadlock-fix' into maintJunio C Hamano2011-05-26
| * | | | | | | Merge branch 'js/maint-send-pack-stateless-rpc-deadlock-fix' into maintJunio C Hamano2011-05-26
* | | | | | | | Merge branch 'bc/maint-status-z-to-use-porcelain'Junio C Hamano2011-06-06
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge branch 'jk/format-patch-am'Junio C Hamano2011-05-31
|\ \ \ \ \ \ \
| * | | | | | | format-patch: preserve subject newlines with -kJeff King2011-05-26
| * | | | | | | clean up calling conventions for pretty.c functionsJeff King2011-05-26
| * | | | | | | pretty: add pp_commit_easy function for simple callersJeff King2011-05-26
| * | | | | | | mailinfo: always clean up rfc822 header foldingJeff King2011-05-26
* | | | | | | | Merge branch 'jc/log-quiet-fix'Junio C Hamano2011-05-31
|\ \ \ \ \ \ \ \
| * | | | | | | | log: --quiet should serve as synonym to -sJunio C Hamano2011-05-28
* | | | | | | | | Merge branch 'jk/maint-remote-mirror-safer'Junio C Hamano2011-05-31
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | remote: allow "-t" with fetch mirrorsJeff King2011-05-26
* | | | | | | | | | Merge branch 'jl/read-tree-m-dry-run'Junio C Hamano2011-05-31
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Teach read-tree the -n|--dry-run optionJens Lehmann2011-05-25
* | | | | | | | | | | Merge branch 'mk/grep-pcre'Junio C Hamano2011-05-30
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | git-grep: do not die upon -F/-P when grep.extendedRegexp is set.Junio C Hamano2011-05-09
| * | | | | | | | | | | git-grep: Bail out when -P is used with -F or -EMichał Kiedrowicz2011-05-09
| * | | | | | | | | | | git-grep: Learn PCREMichał Kiedrowicz2011-05-09
* | | | | | | | | | | | Merge branch 'jc/notes-batch-removal'Junio C Hamano2011-05-29
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | show: --ignore-missingJunio C Hamano2011-05-19
| * | | | | | | | | | | | notes remove: --stdin reads from the standard inputJunio C Hamano2011-05-19
| * | | | | | | | | | | | notes remove: --ignore-missingJunio C Hamano2011-05-19
| * | | | | | | | | | | | notes remove: allow removing more than oneJunio C Hamano2011-05-19
* | | | | | | | | | | | | Merge branch 'jk/haves-from-alternate-odb'Junio C Hamano2011-05-29
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | receive-pack: eliminate duplicate .have refsJeff King2011-05-19
| * | | | | | | | | | | | | refactor refs_from_alternate_cb to allow passing extra dataJeff King2011-05-19
* | | | | | | | | | | | | | Merge branch 'jk/fetch-mark-complete-optimization'Junio C Hamano2011-05-26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | fetch: avoid repeated commits in mark_completeJeff King2011-05-19
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch 'jc/bigfile'Junio C Hamano2011-05-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | index_fd(): turn write_object and format_check arguments into one flagJunio C Hamano2011-05-09
* | | | | | | | | | | | | | | Merge branch 'js/log-abbrev-commit-config'Junio C Hamano2011-05-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Add log.abbrevCommit config variableJay Soffian2011-05-18