summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ns/pretty-format'Junio C Hamano2009-03-056-9/+85
|\
| * bash completion: add --format= and --oneline options for "git log"Teemu Likonen2009-02-271-2/+12
| * Add tests for git log --pretty, --format and --oneline.Felipe Contreras2009-02-251-0/+40
| * Add --oneline that is a synonym to "--pretty=oneline --abbrev-commit"Nanako Shiraishi2009-02-242-0/+8
| * Give short-hands to --pretty=tformat:%formatstringNanako Shiraishi2009-02-242-6/+23
| * Add --format that is a synonym to --prettyNanako Shiraishi2009-02-242-1/+2
* | Merge branch 'jk/sane-relative-time'Junio C Hamano2009-03-051-1/+19
|\ \
| * | never fallback relative times to absoluteJeff King2009-02-251-1/+19
| |/
* | Merge branch 'fc/config-editor'Junio C Hamano2009-03-052-4/+18
|\ \
| * | git config: trivial cleanup for editor actionJohannes Schindelin2009-02-211-6/+3
| * | git config: codestyle cleanupsFelipe Contreras2009-02-211-3/+3
| * | config: Add new option to open an editor.Felipe Contreras2009-02-082-1/+18
* | | Merge branch 'js/send-email'Junio C Hamano2009-03-053-151/+479
|\ \ \
| * | | send-email: add --confirm option and configuration settingJay Soffian2009-03-023-39/+174
| * | | send-email: don't create temporary compose file until it is neededJay Soffian2009-02-231-9/+11
| * | | send-email: --suppress-cc improvementsJay Soffian2009-02-143-36/+169
| * | | send-email: handle multiple Cc addresses when reading mbox messageJay Soffian2009-02-142-74/+123
| * | | send-email: allow send-email to run outside a repoJay Soffian2009-02-141-2/+11
* | | | Merge branch 'sg/rerere-cleanup'Junio C Hamano2009-03-053-29/+20
|\ \ \ \
| * | | | rerere: remove duplicated functionsSZEDER Gábor2009-02-143-29/+20
| |/ / /
* | | | Merge branch 'jc/add-p-unquote'Junio C Hamano2009-03-052-10/+52
|\ \ \ \
| * | | | git-add -i/-p: learn to unwrap C-quoted pathsJunio C Hamano2009-02-182-10/+52
* | | | | Merge branch 'jw/imap-preformatted-html'Junio C Hamano2009-03-052-0/+60
|\ \ \ \ \
| * | | | | imap.preformattedHTML to tell Thunderbird to send non-flowed textJeremy White2009-02-152-0/+60
| | |/ / / | |/| | |
* | | | | Merge branch 'jw/format-patch-attach'Junio C Hamano2009-03-052-2/+28
|\ \ \ \ \
| * | | | | Enable setting attach as the default in .gitconfig for git-format-patch.Jeremy White2009-02-122-2/+28
* | | | | | Merge branch 'sr/force-rebase'Junio C Hamano2009-03-051-5/+19
|\ \ \ \ \ \
| * | | | | | Teach rebase to rebase even if upstream is up to dateSverre Rabbelier2009-02-131-5/+19
* | | | | | | Merge branch 'fg/exclude-bq'Junio C Hamano2009-03-052-2/+9
|\ \ \ \ \ \ \
| * | | | | | | Support "\" in non-wildcard exclusion entriesFinn Arne Gangstad2009-02-122-2/+9
* | | | | | | | Merge branch 'dm/add-i-edit-abort'Junio C Hamano2009-03-051-0/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | add -i: revisit hunk on editor failureDeskin Miller2009-02-111-0/+4
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'tp/completion'Junio C Hamano2009-03-051-38/+42
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixup: Add bare repository indicator for __git_ps1Marius Storm-Olsen2009-02-241-7/+6
| * | | | | | | | Add bare repository indicator for __git_ps1Marius Storm-Olsen2009-02-231-2/+8
| * | | | | | | | completion: More fixes to prevent unbound variable errorsTed Pavlic2009-02-111-4/+4
| * | | | | | | | completion: Better __git_ps1 support when not in working directoryTed Pavlic2009-02-111-14/+22
| * | | | | | | | completion: Use consistent if [...] convention, not "test"Ted Pavlic2009-02-111-20/+11
| * | | | | | | | completion: For consistency, change "git rev-parse" to __gitdir callsTed Pavlic2009-02-111-2/+2
* | | | | | | | | Merge branch 'js/branch-symref'Junio C Hamano2009-03-052-32/+160
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | add basic branch display testsJeff King2009-02-181-0/+81
| * | | | | | | | | branch: clean up repeated strlenJeff King2009-02-181-2/+2
| * | | | | | | | | Avoid segfault with 'git branch' when the HEAD is detachedJohannes Schindelin2009-02-181-0/+2
| * | | | | | | | | builtin-branch: improve output when displaying remote branchesJay Soffian2009-02-131-30/+75
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'al/ansi-color'Junio C Hamano2009-03-056-43/+51
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | builtin-branch.c: Rename branch category color namesArjen Laarhoven2009-02-131-16/+16
| * | | | | | | | | Clean up use of ANSI color sequencesArjen Laarhoven2009-02-136-27/+35
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'js/valgrind'Junio C Hamano2009-03-057-5/+301
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | valgrind: do not require valgrind 3.4.0 or newerJohannes Schindelin2009-02-052-2/+13
| * | | | | | | | | test-lib: avoid assuming that templates/ are in the GIT_EXEC_PATHJohannes Schindelin2009-02-031-3/+1