Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | Merge branch 'jc/maint-merge-recursive-fix' into maint | Junio C Hamano | 2009-08-21 | 2 | -3/+80 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | merge-recursive: don't segfault while handling rename clashes | Junio C Hamano | 2009-07-30 | 2 | -3/+80 | |
* | | | | | | | | | | | | Merge branch 'zf/maint-gitweb-acname' into maint | Junio C Hamano | 2009-08-21 | 1 | -3/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | gitweb: parse_commit_text encoding fix | Zoltán Füzesi | 2009-08-05 | 1 | -3/+2 | |
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'np/maint-limit-delta-cache' into maint | Junio C Hamano | 2009-08-21 | 2 | -4/+12 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | don't let the delta cache grow unbounded in 'git repack' | Nicolas Pitre | 2009-08-05 | 2 | -4/+12 | |
* | | | | | | | | | | | | | Merge branch 'jk/maint-show-tag' into maint | Junio C Hamano | 2009-08-21 | 1 | -1/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | show: add space between multiple items | Jeff King | 2009-07-19 | 1 | -0/+6 | |
| * | | | | | | | | | | | | | show: suppress extra newline when showing annotated tag | Jeff King | 2009-07-19 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | Merge branch 'sb/maint-pull-rebase' into maint | Junio C Hamano | 2009-08-21 | 2 | -3/+24 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | pull: support rebased upstream + fetch + pull --rebase | Santi Béjar | 2009-07-19 | 2 | -6/+13 | |
| * | | | | | | | | | | | | | | t5520-pull: Test for rebased upstream + fetch + pull --rebase | Santi Béjar | 2009-07-19 | 1 | -0/+14 | |
| |/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | filter-branch: make the usage string fit on 80 chars terminals. | Matthieu Moy | 2009-08-18 | 1 | -6/+6 | |
* | | | | | | | | | | | | | | filter-branch: add an example how to add ACKs to a range of commits | Johannes Schindelin | 2009-08-18 | 1 | -0/+10 | |
| |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | docs: describe impact of repack on "clone -s" | Jeff King | 2009-08-17 | 1 | -2/+10 | |
* | | | | | | | | | | | | | Merge branch 'maint-1.6.3' into maint | Junio C Hamano | 2009-08-12 | 9 | -12/+12 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Change mentions of "git programs" to "git commands" | Ori Avtalion | 2009-08-12 | 8 | -10/+10 | |
| * | | | | | | | | | | | | Documentation: merge: one <remote> is required | Paul Bolle | 2009-08-12 | 1 | -1/+1 | |
| * | | | | | | | | | | | | help.c: give correct structure's size to memset() | Johan Herland | 2009-08-12 | 1 | -1/+1 | |
* | | | | | | | | | | | | | push: point to 'git pull' and 'git push --force' in case of non-fast forward | Matthieu Moy | 2009-08-12 | 4 | -5/+103 | |
* | | | | | | | | | | | | | Documentation: add: <filepattern>... is optional | Paul Bolle | 2009-08-12 | 1 | -1/+1 | |
* | | | | | | | | | | | | | Merge branch 'maint-1.6.3' into maint | Junio C Hamano | 2009-08-10 | 2 | -4/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | Fix typos in git-remote.txt and git-symbolic-ref.txt | Štěpán Němec | 2009-08-10 | 2 | -4/+4 | |
* | | | | | | | | | | | | | git-instaweb: fix mod_perl detection for apache2 | Mark A Rada | 2009-08-09 | 1 | -1/+1 | |
| |_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'maint-1.6.3' into maint | Junio C Hamano | 2009-08-07 | 2 | -11/+27 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | / / / / / / / / / | |_|/ / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Merge branch 'maint-1.6.2' into maint-1.6.3 | Junio C Hamano | 2009-08-07 | 2 | -11/+27 | |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | | | ||||||
| | * | | | | | | | | | Merge branch 'maint-1.6.1' into maint-1.6.2 | Junio C Hamano | 2009-08-07 | 2 | -11/+27 | |
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / | | | |/| | | | | | | | ||||||
| | | * | | | | | | | | Merge branch 'maint-1.6.0' into maint-1.6.1 | Junio C Hamano | 2009-08-07 | 2 | -11/+27 | |
| | | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | / / | | | | | |_|_|_|/ / | | | | |/| | | | | | ||||||
| | | | * | | | | | | verify-pack -v: do not report "chain length 0" | Junio C Hamano | 2009-08-07 | 1 | -8/+19 | |
| | | | * | | | | | | t5510: harden the way verify-pack is used | Junio C Hamano | 2009-08-07 | 1 | -3/+8 | |
* | | | | | | | | | | Merge branch 'maint-1.6.3' into maint | Junio C Hamano | 2009-08-05 | 5 | -9/+11 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | ||||||
| * | | | | | | | | | Better usage string for reflog. | Matthieu Moy | 2009-08-05 | 1 | -1/+1 | |
| * | | | | | | | | | hg-to-git: don't import the unused popen2 module | Miklos Vajna | 2009-08-04 | 1 | -1/+1 | |
| * | | | | | | | | | send-email: remove debug trace | Erik Faye-Lund | 2009-08-04 | 1 | -1/+0 | |
| * | | | | | | | | | config: Keep inner whitespace verbatim | Björn Steinbrink | 2009-07-31 | 2 | -6/+9 | |
* | | | | | | | | | | gitweb/README: Document $base_url | Jakub Narebski | 2009-08-05 | 1 | -0/+6 | |
* | | | | | | | | | | Documentation: git submodule: add missing options to synopsis | Jens Lehmann | 2009-08-05 | 1 | -2/+2 | |
| |_|_|_|_|/ / / / |/| | | | | | | | | ||||||
* | | | | | | | | | GIT 1.6.4v1.6.4 | Junio C Hamano | 2009-07-29 | 3 | -7/+15 | |
* | | | | | | | | | Sync with 1.6.3.4 | Junio C Hamano | 2009-07-29 | 3 | -2/+39 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | ||||||
| * | | | | | | | | GIT 1.6.3.4v1.6.3.4 | Junio C Hamano | 2009-07-28 | 3 | -2/+38 | |
| * | | | | | | | | config.txt: document add.ignore-errors | Stephen Boyd | 2009-07-28 | 1 | -0/+5 | |
| * | | | | | | | | request-pull: allow ls-remote to notice remote.$nickname.uploadpack | Tom Grennan | 2009-07-28 | 1 | -1/+1 | |
* | | | | | | | | | Update the documentation of the raw diff output format | David Kågedal | 2009-07-28 | 5 | -9/+10 | |
* | | | | | | | | | git-rerere.txt: Clarify ambiguity of the config variable | Michael J Gruber | 2009-07-28 | 1 | -1/+1 | |
* | | | | | | | | | t9143: do not fail if Compress::Zlib is missing | Eric Wong | 2009-07-26 | 1 | -3/+12 | |
* | | | | | | | | | Trivial path quoting fixes in git-instaweb | Sean Estabrooks | 2009-07-26 | 1 | -2/+2 | |
* | | | | | | | | | Merge branch 'gp/maint-rebase-p-onto' | Junio C Hamano | 2009-07-26 | 2 | -1/+81 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fix rebase -p --onto | Greg Price | 2009-07-22 | 2 | -1/+81 | |
* | | | | | | | | | | Merge branch 'en/fast-export' | Junio C Hamano | 2009-07-26 | 3 | -8/+187 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | fast-export: Document the fact that git-rev-list arguments are accepted | Elijah Newren | 2009-06-27 | 1 | -0/+6 |