summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* merge-recursive: don't detect renames from empty filesjk/maint-1.7.7-merge-recursive-no-rename-emptyJeff King2012-03-222-1/+17
* make is_empty_blob_sha1 available everywhereJeff King2012-03-222-10/+13
* drop casts from users EMPTY_TREE_SHA1_BINJeff King2012-03-222-2/+2
* Document the --histogram diff optionThomas Rast2012-03-061-0/+3
* Sync with 1.7.6.6Junio C Hamano2012-02-052-24/+2
|\
| * Git 1.7.6.6v1.7.6.6maint-1.7.6Junio C Hamano2012-02-052-2/+3
| * imap-send: remove dead codeJeff King2012-02-051-23/+0
* | Git 1.7.7.6v1.7.7.6Junio C Hamano2012-01-182-1/+5
* | diff-index: enable recursive pathspec matching in unpack_treesNguyen Thai Ngoc Duy2012-01-182-0/+10
* | Update draft release notes to 1.7.7.6Junio C Hamano2012-01-121-0/+5
* | Merge branch 'maint-1.7.6' into maint-1.7.7Junio C Hamano2012-01-122-2/+12
|\ \ | |/
| * Update draft release notes to 1.7.6.6Junio C Hamano2012-01-121-0/+5
| * thin-pack: try harder to use preferred base objects as baseJeff King2012-01-121-2/+7
* | Merge branch 'maint-1.7.6' into maint-1.7.7Junio C Hamano2012-01-112-1/+2
|\ \ | |/
| * attr: fix leak in free_attr_elemJeff King2012-01-111-0/+1
| * t2203: fix wrong commit commandNguyễn Thái Ngọc Duy2012-01-111-1/+1
* | Prepare for 1.7.7.6Junio C Hamano2012-01-102-1/+12
* | Merge the attributes fix in from maint-1.6.6 branchJunio C Hamano2012-01-104-33/+66
|\ \ | |/
| * Prepare for 1.7.6.6Junio C Hamano2012-01-102-1/+12
| * Documentation: rerere's rr-cache auto-creation and rerere.enabledJunio C Hamano2012-01-101-1/+2
| * attr.c: clarify the logic to pop attr_stackJunio C Hamano2012-01-101-1/+10
| * attr.c: make bootstrap_attr_stack() leave earlyJunio C Hamano2012-01-101-30/+31
| * attr: drop misguided defensive codingJeff King2012-01-101-1/+1
| * attr: don't confuse prefixes with leading directoriesJeff King2012-01-102-1/+12
* | Merge branch 'maint-1.7.6' into maint-1.7.7Junio C Hamano2012-01-061-4/+4
|\ \ | |/
| * Documentation: rerere.enabled is the primary way to configure rerereThomas Rast2012-01-061-4/+4
* | Merge branch 'maint-1.7.6' into maint-1.7.7Junio C Hamano2012-01-032-5/+5
|\ \ | |/
| * Documentation: read-tree --prefix works with existing subtreesClemens Buchacher2012-01-011-5/+4
| * Add MYMETA.json to perl/.gitignoreJack Nagel2011-12-291-0/+1
* | docs: describe behavior of relative submodule URLsJens Lehmann2012-01-031-1/+6
* | Git 1.7.7.5v1.7.7.5Junio C Hamano2011-12-134-3/+21
* | Merge branch 'ab/clang-lints' into maint-1.7.7Junio C Hamano2011-12-133-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
| * | apply: get rid of useless x < 0 comparison on a size_t typeÆvar Arnfjörð Bjarmason2011-11-061-3/+0
* | | Merge branch 'nd/maint-ignore-exclude' into maint-1.7.7Junio C Hamano2011-12-132-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 'maint-1.7.6' into maint-1.7.7Junio C Hamano2011-12-134-40/+78
|\ \ \ \ | | |_|/ | |/| |
| * | | Git 1.7.6.5v1.7.6.5Junio C Hamano2011-12-134-3/+30
| * | | Merge branch 'jk/maint-fetch-status-table' into maint-1.7.6Junio C Hamano2011-12-131-38/+49
| |\ \ \
| | * | | fetch: create status table using strbufjk/maint-fetch-status-tableJeff King2011-12-091-38/+49
| * | | | Merge branch 'jc/maint-name-rev-all' into maint-1.7.6Junio C Hamano2011-12-131-1/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'ml/mailmap' into maint-1.7.6Junio C Hamano2011-12-131-3/+2
| |\ \ \ \ \
| * | | | | | blame: don't overflow time bufferJeff King2011-12-131-1/+1
* | | | | | | 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 'maint-1.7.6' into maint-1.7.7Junio C Hamano2011-12-052-2/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | stripspace: fix outdated commentJeff King2011-12-051-2/+0
| * | | | | | Add MYMETA.yml to perl/.gitignoreSebastian Morr2011-12-051-0/+1
* | | | | | | documentation fix: git difftool uses diff tools, not merge tools.Thomas Hochstein2011-11-211-1/+1
View Lorry Controller Status