Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | builtin/log.c: Fix an "Using plain integer as NULL pointer" warning | Ramsay Jones | 2011-10-09 | 1 | -1/+1 | |
| * | | | | fmt-merge-msg: use branch.$name.description | Junio C Hamano | 2011-10-07 | 5 | -26/+78 | |
| * | | | | request-pull: use the branch description | Junio C Hamano | 2011-10-05 | 1 | -1/+19 | |
| * | | | | request-pull: state what commit to expect | Junio C Hamano | 2011-10-05 | 2 | -15/+25 | |
| * | | | | request-pull: modernize style | Junio C Hamano | 2011-10-05 | 1 | -16/+13 | |
| * | | | | branch: teach --edit-description option | Junio C Hamano | 2011-10-05 | 2 | -2/+59 | |
| * | | | | format-patch: use branch description in cover letter | Junio C Hamano | 2011-10-05 | 1 | -3/+68 | |
| * | | | | branch: add read_branch_desc() helper function | Junio C Hamano | 2011-10-05 | 2 | -0/+36 | |
| * | | | | Merge branch 'bk/ancestry-path' into jc/branch-desc | Junio C Hamano | 2011-09-21 | 3 | -10/+101 | |
| |\ \ \ \ | ||||||
* | \ \ \ \ | Merge branch 'ab/pull-rebase-config' | Junio C Hamano | 2011-12-09 | 4 | -7/+42 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | pull: introduce a pull.rebase option to enable --rebaseab/pull-rebase-config | Ævar Arnfjörð Bjarmason | 2011-11-07 | 4 | -7/+42 | |
* | | | | | | | Merge branch 'rs/allocate-cache-entry-individually' | Junio C Hamano | 2011-12-09 | 2 | -53/+33 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | cache.h: put single NUL at end of struct cache_entryrs/allocate-cache-entry-individually | René Scharfe | 2011-10-26 | 1 | -1/+1 | |
| * | | | | | | | read-cache.c: allocate index entries individually | René Scharfe | 2011-10-26 | 2 | -51/+31 | |
* | | | | | | | | Merge branch 'maint' | Junio C Hamano | 2011-12-09 | 4 | -15/+5 | |
|\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge branch 'maint-1.7.7' into maint | Junio C Hamano | 2011-12-09 | 4 | -15/+5 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | am: don't persist keepcr flag | Martin von Zweigbergk | 2011-12-09 | 1 | -7/+0 | |
| | * | | | | | | | | mingw: give waitpid the correct signature | Erik Faye-Lund | 2011-12-09 | 2 | -2/+2 | |
| | * | | | | | | | | git symbolic-ref: documentation fix | Michael Haggerty | 2011-12-08 | 1 | -6/+3 | |
* | | | | | | | | | | Merge branch 'master' of git://bogomips.org/git-svnrr/parse-subcommand | Junio C Hamano | 2011-12-05 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | git-svn.perl: close the edit for propedits even with no mods | Steven Walter | 2011-12-01 | 1 | -1/+1 | |
* | | | | | | | | | | | Kick-off the 1.7.9 cycle | Junio C Hamano | 2011-12-05 | 3 | -2/+29 | |
* | | | | | | | | | | | Merge branch 'jk/refresh-porcelain-output' | Junio C Hamano | 2011-12-05 | 1 | -10/+32 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | refresh_index: make porcelain output more specificjk/refresh-porcelain-output | Jeff King | 2011-11-18 | 1 | -2/+21 | |
| * | | | | | | | | | | | refresh_index: rename format variables | Jeff King | 2011-11-18 | 1 | -6/+6 | |
| * | | | | | | | | | | | read-cache: let refresh_cache_ent pass up changed flags | Jeff King | 2011-11-18 | 1 | -3/+6 | |
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'gh/userdiff-matlab' | Junio C Hamano | 2011-12-05 | 7 | -1/+39 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Add built-in diff patterns for MATLAB codegh/userdiff-matlab | Gustaf Hendeby | 2011-11-15 | 7 | -1/+39 | |
| |/ / / / / / / / / / | ||||||
* | | | | | | | | | | | Merge branch 'nd/maint-ignore-exclude' | Junio C Hamano | 2011-12-05 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | checkout,merge: loosen overwriting untracked file check based on info/excludend/maint-ignore-exclude | Nguyễn Thái Ngọc Duy | 2011-11-28 | 2 | -2/+2 | |
* | | | | | | | | | | | | Merge branch 'vr/git-merge-default-to-upstream' | Junio C Hamano | 2011-12-05 | 1 | -3/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Show error for 'git merge' with unset merge.defaultToUpstreamvr/git-merge-default-to-upstream | Vincent van Ravesteijn | 2011-11-21 | 1 | -3/+6 | |
* | | | | | | | | | | | | | Merge branch 'jc/maint-pack-object-cycle' | Junio C Hamano | 2011-12-05 | 1 | -12/+43 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | pack-object: tolerate broken packs that have duplicated objectsjc/maint-pack-object-cycle | Junio C Hamano | 2011-11-16 | 1 | -12/+43 | |
* | | | | | | | | | | | | | | Merge branch 'jc/index-pack-reject-dups' | Junio C Hamano | 2011-12-05 | 4 | -2/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | receive-pack, fetch-pack: reject bogus pack that records objects twicejc/index-pack-reject-dups | Junio C Hamano | 2011-11-16 | 4 | -2/+11 | |
* | | | | | | | | | | | | | | | Merge branch 'vr/msvc' | Junio C Hamano | 2011-12-05 | 14 | -19/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | MSVC: Remove unneeded header stubsvr/msvc | Vincent van Ravesteijn | 2011-10-31 | 12 | -12/+0 | |
| * | | | | | | | | | | | | | | | Compile fix for MSVC: Include <io.h> | Vincent van Ravesteijn | 2011-10-31 | 1 | -0/+1 | |
| * | | | | | | | | | | | | | | | Compile fix for MSVC: Do not include sys/resources.h | Vincent van Ravesteijn | 2011-10-31 | 1 | -7/+6 | |
* | | | | | | | | | | | | | | | | Merge branch 'na/strtoimax' | Junio C Hamano | 2011-12-05 | 4 | -13/+46 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | Support sizes >=2G in various config options accepting 'g' sizes.na/strtoimax | Nick Alcock | 2011-11-05 | 1 | -10/+31 | |
| * | | | | | | | | | | | | | | | | Compatibility: declare strtoimax() under NO_STRTOUMAX | Johannes Sixt | 2011-11-05 | 1 | -0/+2 | |
| * | | | | | | | | | | | | | | | | Add strtoimax() compatibility function. | Nick Alcock | 2011-11-02 | 2 | -3/+13 | |
| | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Merge branch 'ab/clang-lints' | Junio C Hamano | 2011-12-05 | 3 | -5/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | cast variable in call to free() in builtin/diff.c and submodule.cab/clang-lints | Ævar Arnfjörð Bjarmason | 2011-11-06 | 2 | -2/+2 | |
| * | | | | | | | | | | | | | | | | apply: get rid of useless x < 0 comparison on a size_t type | Ævar Arnfjörð Bjarmason | 2011-11-06 | 1 | -3/+0 | |
* | | | | | | | | | | | | | | | | | Merge branch 'nd/prune-progress' | Junio C Hamano | 2011-12-05 | 5 | -17/+60 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | reachable: per-object progressnd/prune-progress | Jeff King | 2011-11-07 | 1 | -14/+37 | |
| * | | | | | | | | | | | | | | | | | prune: handle --progress/no-progress | Jeff King | 2011-11-07 | 2 | -3/+12 |