summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* archive: remove args member from struct archiverRené Scharfe2008-07-153-39/+28
* Update draft release notes for 1.6.0Junio C Hamano2008-07-131-1/+38
* Merge branch 'sp/maint-bash-completion-optim'Junio C Hamano2008-07-131-15/+16
|\
| * bash completion: Don't offer "a.." as a completion for "a."Shawn O. Pearce2008-07-131-3/+0
| * bash completion: Improve responsiveness of git-log completionShawn O. Pearce2008-07-131-12/+16
* | git-request-pull: replace call to deprecated peek-remoteRamsay Jones2008-07-131-1/+1
* | Make rebase--interactive use OPTIONS_SPECStephan Beyer2008-07-131-26/+51
* | t3404: test two "preserve merges with -p" casesStephan Beyer2008-07-131-5/+21
* | git-am/git-mailsplit: correct synopsis for reading from stdinStephan Beyer2008-07-133-4/+4
* | Merge branch 'maint' to sync with 1.5.6.3Junio C Hamano2008-07-138-22/+61
|\ \
| * | GIT 1.5.6.3v1.5.6.3Junio C Hamano2008-07-132-9/+20
| * | git-am: Do not exit silently if committer is unsetStephan Beyer2008-07-131-1/+2
| * | t0004: fix timing bugJunio C Hamano2008-07-121-9/+10
| * | git-mailinfo: document the -n optionLukas Sandström2008-07-112-2/+5
| * | Fix backwards-incompatible handling of core.sharedRepositoryPetr Baudis2008-07-112-1/+24
| |/
* | Merge branch 'ph/parseopt-step-blame'Junio C Hamano2008-07-138-673/+788
|\ \
| * | revisions: refactor handle_revision_opt into parse_revision_opt.Pierre Habouzit2008-07-094-23/+23
| * | git-shortlog: migrate to parse-options partially.Pierre Habouzit2008-07-091-58/+77
| * | git-blame: fix lapsusPierre Habouzit2008-07-091-1/+1
| * | git-blame: migrate to incremental parse-option [2/2]Pierre Habouzit2008-07-081-92/+38
| * | git-blame: migrate to incremental parse-option [1/2]Pierre Habouzit2008-07-081-102/+118
| * | revisions: split handle_revision_opt() from setup_revisions()Pierre Habouzit2008-07-082-326/+226
| * | Merge branch 'jc/blame' (early part) into HEADJunio C Hamano2008-07-085-61/+199
| |\ \
| | * | git-blame --reverseJunio C Hamano2008-04-121-16/+65
| | * | builtin-blame.c: allow more than 16 parentsJunio C Hamano2008-04-121-32/+61
| | * | builtin-blame.c: move prepare_final() into a separate function.Junio C Hamano2008-04-121-23/+33
| | * | rev-list --childrenJunio C Hamano2008-04-122-0/+14
| | * | revision traversal: --children optionJunio C Hamano2008-04-122-3/+38
| * | | parse-opt: add PARSE_OPT_KEEP_ARGV0 parser option.Pierre Habouzit2008-06-302-0/+2
| * | | parse-opt: fake short strings for callers to believe in.Pierre Habouzit2008-06-302-0/+16
| * | | parse-opt: do not print errors on unknown options, return -2 intead.Pierre Habouzit2008-06-301-13/+30
| * | | parse-opt: create parse_options_step.Pierre Habouzit2008-06-302-39/+56
| * | | parse-opt: Export a non NORETURN usage dumper.Pierre Habouzit2008-06-302-7/+26
| * | | parse-opt: have parse_options_{start,end}.Pierre Habouzit2008-06-302-30/+55
* | | | Merge branch 'am/stash-branch'Junio C Hamano2008-07-133-1/+99
|\ \ \ \
| * | | | Add a test for "git stash branch"Abhijit Menon-Sen2008-07-061-0/+60
| * | | | Implement "git stash branch <newbranch> <stash>"Abhijit Menon-Sen2008-07-052-1/+39
* | | | | Merge branch 'sg/stash-k-i'Junio C Hamano2008-07-133-6/+52
|\ \ \ \ \
| * | | | | Documentation: tweak use case in "git stash save --keep-index"Eric Raible2008-07-081-7/+8
| * | | | | stash: introduce 'stash save --keep-index' optionSZEDER Gábor2008-07-053-6/+51
| |/ / / /
* | | | | Merge branch 'jc/report-tracking'Junio C Hamano2008-07-137-90/+244
|\ \ \ \ \
| * | | | | branch -r -v: do not spit out garbageJunio C Hamano2008-07-061-3/+2
| * | | | | stat_tracking_info(): clear object flags used during countingJunio C Hamano2008-07-033-0/+75
| * | | | | git-branch -v: show the remote tracking statisticsJunio C Hamano2008-07-021-2/+25
| * | | | | git-status: show the remote tracking statisticsJunio C Hamano2008-07-021-0/+22
| * | | | | Refactor "tracking statistics" code used by "git checkout"Junio C Hamano2008-07-023-88/+123
* | | | | | Merge branch 'js/pick-root'Junio C Hamano2008-07-132-10/+46
|\ \ \ \ \ \
| * | | | | | Allow cherry-picking root commitsJohannes Schindelin2008-07-072-10/+46
* | | | | | | Merge branch 'ab/bundle'Junio C Hamano2008-07-131-2/+11
|\ \ \ \ \ \ \
| * | | | | | | Teach git-bundle to read revision arguments from stdin like git-rev-list.Adam Brewster2008-07-071-2/+11
| |/ / / / / /