aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'tr/rfc-reset-doc'Junio C Hamano2010-08-12
|\
| * Documentation/reset: move "undo permanently" example behind "make topic"Thomas Rast2010-07-19
| * Documentation/reset: reorder examples to match descriptionThomas Rast2010-07-19
| * Documentation/reset: promote 'examples' one section upThomas Rast2010-07-19
| * Documentation/reset: separate options by modeThomas Rast2010-07-19
| * Documentation/git-reset: reorder modes for soft-mixed-hard progressionThomas Rast2010-07-19
* | Merge branch 'jn/parse-date-basic'Junio C Hamano2010-08-12
|\ \
| * | Export parse_date_basic() to convert a date string to timestampJonathan Nieder2010-07-15
| |/
* | Merge branch 'sp/fix-smart-http-deadlock-on-error'Junio C Hamano2010-08-12
|\ \
| * | smart-http: Don't deadlock on server failureShawn O. Pearce2010-08-06
* | | Merge branch 'maint'Junio C Hamano2010-08-12
|\ \ \
| * | | push: mention "git pull" in error message for non-fast forwardsMatthieu Moy2010-08-12
| * | | Standardize do { ... } while (0) styleJonathan Nieder2010-08-12
| * | | t/t7003: replace \t with literal tab in sed expressionBrandon Casey2010-08-12
| * | | index-pack: Don't follow replace refs.Nelson Elhage2010-08-12
* | | | Merge branch 'maint'Junio C Hamano2010-08-11
|\ \ \ \ | |/ / /
| * | | post-receive-email: remove spurious commas in email subjectMatthieu Moy2010-08-11
| * | | fast-import: export correctly marks larger than 2^20-1Raja R Harinath2010-08-11
| * | | t/lib-git-svn.sh: use $PERL_PATH for perl, not perl from $PATHÆvar Arnfjörð Bjarmason2010-08-11
| * | | diff: strip extra "/" when stripping prefixJakub Narebski2010-08-11
* | | | Merge branch 'maint'Junio C Hamano2010-08-09
|\ \ \ \ | |/ / /
| * | | gitweb: clarify search results page when no matching commit foundJonathan Nieder2010-08-09
| * | | Documentation: add a FILES section for show-refJonathan Nieder2010-08-09
| * | | Makefile: add missing dependency on http.hJonathan Nieder2010-08-09
| * | | Makefile: add missing dependencies on url.hJonathan Nieder2010-08-09
| * | | Documentation/git-log: Clarify --full-diffMichael J Gruber2010-08-09
| * | | git-rebase: fix typo when parsing --force-rebaseWilly Tarreau2010-08-09
| * | | imap-send: Fix sprintf usageÆvar Arnfjörð Bjarmason2010-08-09
| * | | prune: allow --dry-run for -n and --verbose for -vRené Scharfe2010-08-09
| * | | notes: allow --dry-run for -n and --verbose for -vRené Scharfe2010-08-09
| * | | Document -B<n>[/<m>], -M<n> and -C<n> variants of -B, -M and -CMatthieu Moy2010-08-09
| * | | Documentation: cite git-am from git-applyBrad King2010-08-09
| * | | t7003: fix subdirectory-filter testThomas Rast2010-08-09
| * | | Allow "check-ref-format --branch" from subdirectoryJonathan Nieder2010-08-06
| * | | check-ref-format: handle subcommands in separate functionsJonathan Nieder2010-08-06
| * | | pretty-options.txt: match --format's documentation with implementation.Matthieu Moy2010-08-05
* | | | Merge branch 'webrick' of git://git.bogomips.org/git-svnJunio C Hamano2010-08-09
|\ \ \ \
| * | | | instaweb: add access+error logging for WEBrickEric Wong2010-08-05
| * | | | instaweb: minimize moving parts for WEBrickEric Wong2010-08-05
| * | | | instaweb: fix WEBrick server supportEric Wong2010-08-05
* | | | | Merge git://git.bogomips.org/git-svnJunio C Hamano2010-08-06
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | git svn: URL-decode left-hand side of svn refspecSteven Walter2010-08-05
* | | | | Merge branch 'maint'Junio C Hamano2010-08-03
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'sv/maint-diff-q-clear-fix' into maintJunio C Hamano2010-08-03
| |\ \ \ \
| | * | | | Fix DIFF_QUEUE_CLEAR refactoringJunio C Hamano2010-08-02
| * | | | | Merge branch 'rr/svn-fe' into maintJunio C Hamano2010-08-03
| |\ \ \ \ \
| | * | | | | contrib/svn-fe: Add the svn-fe target to .gitignoreRamkumar Ramachandra2010-08-03
| | * | | | | contrib/svn-fe: Fix IncludePathRamkumar Ramachandra2010-08-03
| * | | | | | Merge branch 'pt/git-gui' into maintJunio C Hamano2010-08-03
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge git://repo.or.cz/git-gui into pt/git-guiJunio C Hamano2010-08-02
| | |\ \ \ \ \ \