Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | --dirstat: Describe non-obvious differences relative to --stat or regular diff | Johan Herland | 2011-04-11 | 6 | -7/+40 |
* | Git 1.7.4.4v1.7.4.4 | Junio C Hamano | 2011-04-06 | 3 | -8/+6 |
* | Merge branch 'nm/maint-conflicted-submodule-entries' into maint | Junio C Hamano | 2011-04-06 | 3 | -9/+83 |
|\ | |||||
| * | submodule: process conflicting submodules only once | Nicolas Morey-Chaisemartin | 2011-03-30 | 3 | -9/+83 |
* | | Merge branch 'mg/rev-list-n-reverse-doc' into maint | Junio C Hamano | 2011-04-06 | 2 | -161/+163 |
|\ \ | |||||
| * | | git-log.txt,rev-list-options.txt: put option blocks in proper order | Michael J Gruber | 2011-03-09 | 2 | -160/+160 |
| * | | git-log.txt,rev-list-options.txt: -n/--max-count is commit limiting | Michael J Gruber | 2011-03-08 | 2 | -1/+3 |
* | | | Documentation: trivial grammar fix in core.worktree description | SZEDER Gábor | 2011-04-04 | 1 | -1/+1 |
* | | | gitweb: Fix parsing of negative fractional timezones in JavaScript | Jakub Narebski | 2011-04-04 | 1 | -5/+19 |
* | | | Start preparing for 1.7.4.4 | Junio C Hamano | 2011-04-03 | 2 | -1/+38 |
* | | | pull: do not clobber untracked files on initial pull | Jeff King | 2011-04-03 | 2 | -1/+12 |
* | | | Merge branch 'jc/index-update-if-able' into maint | Junio C Hamano | 2011-04-03 | 4 | -13/+29 |
|\ \ \ | |||||
| * | | | update $GIT_INDEX_FILE when there are racily clean entries | Junio C Hamano | 2011-03-21 | 1 | -1/+14 |
| * | | | diff/status: refactor opportunistic index update | Junio C Hamano | 2011-03-21 | 4 | -13/+16 |
* | | | | Merge branch 'lt/default-abbrev' into maint | Junio C Hamano | 2011-04-03 | 5 | -3/+23 |
|\ \ \ \ | |||||
| * | | | | Rename core.abbrevlength back to core.abbrev | Junio C Hamano | 2011-03-20 | 2 | -2/+2 |
| * | | | | Make the default abbrev length configurable | Linus Torvalds | 2011-03-11 | 5 | -3/+23 |
* | | | | | Merge branch 'jc/maint-rev-list-culled-boundary' into maint | Junio C Hamano | 2011-04-03 | 2 | -1/+33 |
|\ \ \ \ \ | |||||
| * | | | | | list-objects.c: don't add an unparsed NULL as a pending tree | Junio C Hamano | 2011-03-14 | 2 | -1/+33 |
* | | | | | | Merge branch 'mm/maint-log-n-with-diff-filtering' into maint | Junio C Hamano | 2011-04-03 | 5 | -1/+26 |
|\ \ \ \ \ \ | |||||
| * | | | | | | log: fix --max-count when used together with -S or -G | Matthieu Moy | 2011-03-09 | 5 | -1/+26 |
* | | | | | | | Merge branch 'jk/format-patch-multiline-header' into maint | Junio C Hamano | 2011-04-03 | 4 | -10/+121 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | format-patch: rfc2047-encode newlines in headers | Jeff King | 2011-02-23 | 1 | -2/+2 |
| * | | | | | | | format-patch: wrap long header lines | Jeff King | 2011-02-23 | 2 | -8/+108 |
| * | | | | | | | strbuf: add fixed-length version of add_wrapped_text | Jeff King | 2011-02-23 | 2 | -0/+11 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'jn/maint-instaweb-plack-fix' into maint | Junio C Hamano | 2011-04-03 | 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 'lp/config-vername-check' into maint | Junio C Hamano | 2011-04-03 | 4 | -50/+111 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Disallow empty section and variable names | Libor Pechacek | 2011-02-22 | 2 | -1/+10 |
| * | | | | | | | | Sanity-check config variable names | Libor Pechacek | 2011-02-22 | 4 | -50/+102 |
* | | | | | | | | | compat: add missing #include <sys/resource.h> | Jonathan Nieder | 2011-04-03 | 1 | -0/+1 |
* | | | | | | | | | Git 1.7.4.3v1.7.4.3 | Junio C Hamano | 2011-04-03 | 3 | -2/+34 |
* | | | | | | | | | Doc: mention --delta-base-offset is the default for Porcelain commands | Junio C Hamano | 2011-04-02 | 1 | -1/+6 |
* | | | | | | | | | Merge branch 'nd/index-doc' into maint | Junio C Hamano | 2011-04-01 | 1 | -0/+185 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | doc: technical details about the index file format | Junio C Hamano | 2011-03-23 | 1 | -37/+57 |
| * | | | | | | | | | doc: technical details about the index file format | Nguyễn Thái Ngọc Duy | 2011-02-27 | 1 | -0/+165 |
* | | | | | | | | | | Merge branch 'pk/stash-apply-status-relative' into maint | Junio C Hamano | 2011-04-01 | 2 | -1/+21 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Add test: git stash shows status relative to current dir | Piotr Krukowiecki | 2011-03-20 | 1 | -0/+19 |
| * | | | | | | | | | | git stash: show status relative to current directory | Piotr Krukowiecki | 2011-03-14 | 1 | -1/+2 |
* | | | | | | | | | | | Merge branch 'jc/maint-diff-q-filter' into maint | Junio C Hamano | 2011-04-01 | 2 | -1/+9 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | diff --quiet: disable optimization when --diff-filter=X is used | Junio C Hamano | 2011-03-16 | 2 | -1/+9 |
* | | | | | | | | | | | | Merge branch 'js/maint-stash-index-copy' into maint | Junio C Hamano | 2011-04-01 | 1 | -6/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | stash: copy the index using --index-output instead of cp -p | Johannes Sixt | 2011-03-17 | 1 | -6/+5 |
| * | | | | | | | | | | | | stash: fix incorrect quoting in cleanup of temporary files | Johannes Sixt | 2011-03-17 | 1 | -1/+1 |
| | |/ / / / / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'mg/doc-bisect-tweak-worktree' into maint | Junio C Hamano | 2011-04-01 | 1 | -23/+38 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | git-bisect.txt: example for bisecting with hot-fix | Michael J Gruber | 2011-03-15 | 1 | -0/+33 |
| * | | | | | | | | | | | | git-bisect.txt: streamline run presentation | Michael J Gruber | 2011-03-15 | 1 | -26/+8 |
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'jh/maint-do-not-track-non-branches' into maint | Junio C Hamano | 2011-04-01 | 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' into maint | Junio C Hamano | 2011-04-01 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |