Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'jk/strbuf-vaddf' | Junio C Hamano | 2011-03-15 | 7 | -64/+38 |
|\ | |||||
| * | compat: fall back on __va_copy if available | Jonathan Nieder | 2011-03-08 | 1 | -1/+10 |
| * | strbuf: add strbuf_vaddf | Jeff King | 2011-02-26 | 5 | -63/+25 |
| * | compat: provide a fallback va_copy definition | Jeff King | 2011-02-26 | 2 | -1/+4 |
* | | Merge branch 'mm/push-default-advice' | Junio C Hamano | 2011-03-15 | 1 | -7/+24 |
|\ \ | |||||
| * | | push: better error message when no remote configured | Matthieu Moy | 2011-03-02 | 1 | -1/+8 |
| * | | push: better error messages when push.default = tracking | Matthieu Moy | 2011-03-02 | 1 | -6/+16 |
* | | | Merge branch 'jn/maint-instaweb-plack-fix' | Junio C Hamano | 2011-03-15 | 1 | -2/+4 |
|\ \ \ | |||||
| * | | | git-instaweb: Change how gitweb.psgi is made runnable as standalone app | Jakub Narebski | 2011-02-27 | 1 | -2/+4 |
* | | | | Merge branch 'sp/maint-fd-limit' | Junio C Hamano | 2011-03-15 | 4 | -19/+85 |
|\ \ \ \ | |||||
| * | | | | sha1_file.c: Don't retain open fds on small packs | Shawn O. Pearce | 2011-03-02 | 3 | -6/+39 |
| * | | | | mingw: add minimum getrlimit() compatibility stub | Erik Faye-Lund | 2011-03-02 | 1 | -0/+16 |
| * | | | | Limit file descriptors used by packs | Shawn O. Pearce | 2011-02-28 | 1 | -13/+30 |
| |/ / / | |||||
* | | | | Merge branch 'jc/checkout-orphan-warning' | Junio C Hamano | 2011-03-15 | 1 | -6/+95 |
|\ \ \ \ | |||||
| * | | | | commit: give final warning when reattaching HEAD to leave commits behind | Junio C Hamano | 2011-02-23 | 1 | -6/+95 |
* | | | | | Merge branch 'jh/maint-do-not-track-non-branches' | Junio C Hamano | 2011-03-15 | 4 | -18/+39 |
|\ \ \ \ \ | |||||
| * | | | | | branch/checkout --track: Ensure that upstream branch is indeed a branch | Johan Herland | 2011-02-16 | 4 | -18/+39 |
* | | | | | | Merge branch 'fk/maint-cvsimport-early-failure' | Junio C Hamano | 2011-03-15 | 1 | -1/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | git-cvsimport.perl: Bail out right away when reading from the server fails | Fabian Keil | 2011-02-27 | 1 | -1/+3 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'jc/maint-apply-report-offset' | Junio C Hamano | 2011-03-15 | 1 | -2/+14 |
|\ \ \ \ \ \ | |||||
| * | | | | | | apply -v: show offset count when patch did not apply exactly | Junio C Hamano | 2011-03-06 | 1 | -2/+14 |
* | | | | | | | Merge branch 'jc/maint-apply-no-double-patch' | Junio C Hamano | 2011-03-15 | 1 | -1/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | apply: do not patch lines that were already patched | Junio C Hamano | 2011-03-04 | 1 | -1/+6 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'mr/hpux' | Junio C Hamano | 2011-03-15 | 2 | -1/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | git-compat-util.h: Honor HP C's noreturn attribute | Michal Rokos | 2011-03-08 | 1 | -1/+4 |
| * | | | | | | | Makefile: add NO_FNMATCH_CASEFOLD to HP-UX section | Michal Rokos | 2011-03-08 | 1 | -0/+1 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Documentation: running test with --debug keeps "trash" directory | Piotr Krukowiecki | 2011-03-15 | 1 | -0/+4 |
* | | | | | | | Merge branch 'jk/doc-credits' of git://github.com/peff/git | Junio C Hamano | 2011-03-15 | 138 | -1133/+25 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | docs: point git.txt author credits to git-scm.com | Jeff King | 2011-03-12 | 1 | -2/+4 |
| * | | | | | | | doc: add missing git footers | Jeff King | 2011-03-11 | 5 | -0/+20 |
| * | | | | | | | doc: drop author/documentation sections from most pages | Jeff King | 2011-03-11 | 134 | -1134/+4 |
* | | | | | | | | Merge branch 'sp/maint-smart-http-sans-100-continue' | Junio C Hamano | 2011-03-14 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | smart-http: Really never use Expect: 100-continue | Shawn O. Pearce | 2011-03-14 | 1 | -1/+1 |
* | | | | | | | | | Documentation: "rebase <onto> <that>" stays on <that> branch upon exit | Drew Northup | 2011-03-14 | 1 | -2/+3 |
* | | | | | | | | | object.h: Remove obsolete struct object_refs | Jakob Pfender | 2011-03-14 | 1 | -5/+0 |
* | | | | | | | | | Merge branch 'pw/p4' | Junio C Hamano | 2011-03-13 | 2 | -1/+17 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | git-p4: test clone @all | Pete Wyckoff | 2011-03-13 | 1 | -0/+16 |
| * | | | | | | | | git-p4: fix clone @all regression | Pete Wyckoff | 2011-03-13 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2011-03-10 | 5 | -21/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Revert "core.abbrevguard: Ensure short object names stay unique a bit longer" | Junio C Hamano | 2011-03-10 | 5 | -21/+1 |
* | | | | | | | | | | Update Release Notes to 1.7.5 | Junio C Hamano | 2011-03-09 | 1 | -3/+27 |
* | | | | | | | | | | Merge branch 'js/cherry-pick-usability' | Junio C Hamano | 2011-03-09 | 12 | -156/+308 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Teach commit about CHERRY_PICK_HEAD | Jay Soffian | 2011-02-21 | 7 | -104/+158 |
| * | | | | | | | | | | bash: teach __git_ps1 about CHERRY_PICK_HEAD | Jay Soffian | 2011-02-21 | 1 | -0/+2 |
| * | | | | | | | | | | Introduce CHERRY_PICK_HEAD | Jay Soffian | 2011-02-21 | 7 | -4/+132 |
| * | | | | | | | | | | t3507: introduce pristine-detach helper | Jonathan Nieder | 2011-02-21 | 1 | -54/+22 |
| | |_|_|/ / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'js/checkout-untracked-symlink' | Junio C Hamano | 2011-03-09 | 3 | -4/+62 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | do not overwrite untracked symlinks | Clemens Buchacher | 2011-02-21 | 2 | -4/+12 |
| * | | | | | | | | | | Demonstrate breakage: checkout overwrites untracked symlink with directory | Johannes Sixt | 2011-02-15 | 1 | -0/+50 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'so/submodule-no-update-first-time' | Junio C Hamano | 2011-03-09 | 2 | -0/+61 |
|\ \ \ \ \ \ \ \ \ \ |