summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/request-pull-show-head-4'Junio C Hamano2011-12-0912-59/+313
|\
| * request-pull: use the annotated tag contentsJunio C Hamano2011-11-092-0/+18
| * fmt-merge-msg.c: Fix an "dubious one-bit signed bitfield" sparse errorRamsay Jones2011-10-151-1/+1
| * environment.c: Fix an sparse "symbol not declared" warningRamsay Jones2011-10-091-0/+1
| * builtin/log.c: Fix an "Using plain integer as NULL pointer" warningRamsay Jones2011-10-091-1/+1
| * fmt-merge-msg: use branch.$name.descriptionJunio C Hamano2011-10-075-26/+78
| * request-pull: use the branch descriptionJunio C Hamano2011-10-051-1/+19
| * request-pull: state what commit to expectJunio C Hamano2011-10-052-15/+25
| * request-pull: modernize styleJunio C Hamano2011-10-051-16/+13
| * branch: teach --edit-description optionJunio C Hamano2011-10-052-2/+59
| * format-patch: use branch description in cover letterJunio C Hamano2011-10-051-3/+68
| * branch: add read_branch_desc() helper functionJunio C Hamano2011-10-052-0/+36
| * Merge branch 'bk/ancestry-path' into jc/branch-descJunio C Hamano2011-09-213-10/+101
| |\
* | \ Merge branch 'ab/pull-rebase-config'Junio C Hamano2011-12-094-7/+42
|\ \ \
| * | | pull: introduce a pull.rebase option to enable --rebaseab/pull-rebase-configÆvar Arnfjörð Bjarmason2011-11-074-7/+42
* | | | Merge branch 'rs/allocate-cache-entry-individually'Junio C Hamano2011-12-092-53/+33
|\ \ \ \
| * | | | cache.h: put single NUL at end of struct cache_entryrs/allocate-cache-entry-individuallyRené Scharfe2011-10-261-1/+1
| * | | | read-cache.c: allocate index entries individuallyRené Scharfe2011-10-262-51/+31
* | | | | Merge branch 'maint'Junio C Hamano2011-12-094-15/+5
|\ \ \ \ \
| * \ \ \ \ Merge branch 'maint-1.7.7' into maintJunio C Hamano2011-12-094-15/+5
| |\ \ \ \ \
| | * | | | | am: don't persist keepcr flagMartin von Zweigbergk2011-12-091-7/+0
| | * | | | | mingw: give waitpid the correct signatureErik Faye-Lund2011-12-092-2/+2
| | * | | | | git symbolic-ref: documentation fixMichael Haggerty2011-12-081-6/+3
* | | | | | | Merge branch 'master' of git://bogomips.org/git-svnrr/parse-subcommandJunio C Hamano2011-12-051-1/+1
|\ \ \ \ \ \ \
| * | | | | | | git-svn.perl: close the edit for propedits even with no modsSteven Walter2011-12-011-1/+1
* | | | | | | | Kick-off the 1.7.9 cycleJunio C Hamano2011-12-053-2/+29
* | | | | | | | Merge branch 'jk/refresh-porcelain-output'Junio C Hamano2011-12-051-10/+32
|\ \ \ \ \ \ \ \
| * | | | | | | | refresh_index: make porcelain output more specificjk/refresh-porcelain-outputJeff King2011-11-181-2/+21
| * | | | | | | | refresh_index: rename format variablesJeff King2011-11-181-6/+6
| * | | | | | | | read-cache: let refresh_cache_ent pass up changed flagsJeff King2011-11-181-3/+6
* | | | | | | | | Merge branch 'gh/userdiff-matlab'Junio C Hamano2011-12-057-1/+39
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add built-in diff patterns for MATLAB codegh/userdiff-matlabGustaf Hendeby2011-11-157-1/+39
| |/ / / / / / / /
* | | | | | | | | Merge branch 'nd/maint-ignore-exclude'Junio C Hamano2011-12-052-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | checkout,merge: loosen overwriting untracked file check based on info/excludend/maint-ignore-excludeNguyễn Thái Ngọc Duy2011-11-282-2/+2
* | | | | | | | | | Merge branch 'vr/git-merge-default-to-upstream'Junio C Hamano2011-12-051-3/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Show error for 'git merge' with unset merge.defaultToUpstreamvr/git-merge-default-to-upstreamVincent van Ravesteijn2011-11-211-3/+6
* | | | | | | | | | | Merge branch 'jc/maint-pack-object-cycle'Junio C Hamano2011-12-051-12/+43
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | pack-object: tolerate broken packs that have duplicated objectsjc/maint-pack-object-cycleJunio C Hamano2011-11-161-12/+43
* | | | | | | | | | | | Merge branch 'jc/index-pack-reject-dups'Junio C Hamano2011-12-054-2/+11
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | receive-pack, fetch-pack: reject bogus pack that records objects twicejc/index-pack-reject-dupsJunio C Hamano2011-11-164-2/+11
* | | | | | | | | | | | | Merge branch 'vr/msvc'Junio C Hamano2011-12-0514-19/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | MSVC: Remove unneeded header stubsvr/msvcVincent van Ravesteijn2011-10-3112-12/+0
| * | | | | | | | | | | | | Compile fix for MSVC: Include <io.h>Vincent van Ravesteijn2011-10-311-0/+1
| * | | | | | | | | | | | | Compile fix for MSVC: Do not include sys/resources.hVincent van Ravesteijn2011-10-311-7/+6
* | | | | | | | | | | | | | Merge branch 'na/strtoimax'Junio C Hamano2011-12-054-13/+46
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Support sizes >=2G in various config options accepting 'g' sizes.na/strtoimaxNick Alcock2011-11-051-10/+31
| * | | | | | | | | | | | | | Compatibility: declare strtoimax() under NO_STRTOUMAXJohannes Sixt2011-11-051-0/+2
| * | | | | | | | | | | | | | Add strtoimax() compatibility function.Nick Alcock2011-11-022-3/+13
| | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'ab/clang-lints'Junio C Hamano2011-12-053-5/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | cast variable in call to free() in builtin/diff.c and submodule.cab/clang-lintsÆvar Arnfjörð Bjarmason2011-11-062-2/+2
View Lorry Controller Status