summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* refresh_index: do not show unmerged path that is outside pathspecjc/add-refresh-unmergedJunio C Hamano2012-02-172-2/+24
* Update draft release notes to 1.7.9.2Junio C Hamano2012-02-162-1/+28
* Merge branch 'jc/checkout-out-of-unborn' into maintJunio C Hamano2012-02-162-1/+29
|\
| * git checkout -b: allow switching out of an unborn branchjc/checkout-out-of-unbornJunio C Hamano2012-02-062-1/+29
* | Merge branch 'jc/maint-mailmap-output' into maintJunio C Hamano2012-02-161-8/+10
|\ \
| * | mailmap: always return a plain mail address from map_user()jc/maint-mailmap-outputJunio C Hamano2012-02-061-8/+10
| |/
* | Merge branch 'jk/prompt-fallback-to-tty' into maintJunio C Hamano2012-02-161-9/+18
|\ \
| * | prompt: fall back to terminal if askpass failsjk/prompt-fallback-to-ttyJeff King2012-02-031-7/+17
| * | prompt: clean up strbuf usageJeff King2012-02-031-2/+1
* | | Merge branch 'jn/gitweb-search-utf-8' into maintJunio C Hamano2012-02-161-8/+8
|\ \ \
| * | | gitweb: Allow UTF-8 encoded CGI query parameters and path_infojn/gitweb-search-utf-8Jakub Narebski2012-02-031-8/+8
| |/ /
* | | Merge branch 'jc/maint-commit-ignore-i-t-a' into maintJunio C Hamano2012-02-162-6/+8
|\ \ \
| * | | commit: ignore intent-to-add entries instead of refusingjc/maint-commit-ignore-i-t-aJunio C Hamano2012-02-072-6/+8
* | | | Merge branch 'mm/empty-loose-error-message' into maintJunio C Hamano2012-02-161-0/+5
|\ \ \ \
| * | | | fsck: give accurate error message on empty loose object filesmm/empty-loose-error-messageMatthieu Moy2012-02-061-0/+5
* | | | | Merge branch 'nk/ctype-for-perf' into maintJunio C Hamano2012-02-162-1/+16
|\ \ \ \ \
| * | | | | ctype: implement islower/isupper macronk/ctype-for-perfNamhyung Kim2012-02-101-0/+15
| * | | | | ctype.c only wants git-compat-util.hNamhyung Kim2012-02-101-1/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'jx/i18n-more-marking' into maintJunio C Hamano2012-02-162-14/+24
|\ \ \ \ \
| * | | | | i18n: format_tracking_info "Your branch is behind" messagejx/i18n-more-markingJiang Xin2012-02-011-11/+21
| * | | | | i18n: git-commit whence_s "merge/cherry-pick" messageJiang Xin2012-02-011-3/+3
| |/ / / /
* | | | | man: rearrange git synopsis to fit in 80 linesZbigniew Jędrzejewski-Szmek2012-02-161-3/+3
* | | | | completion: --list option for git-branchRalf Thielow2012-02-161-1/+1
* | | | | Merge branch 'rt/completion-branch-edit-desc' into maintJunio C Hamano2012-02-161-1/+1
|\ \ \ \ \
| * | | | | completion: --edit-description option for git-branchrt/completion-branch-edit-descRalf Thielow2012-01-291-1/+1
| |/ / / /
* | | | | Git 1.7.9.1v1.7.9.1Junio C Hamano2012-02-143-2/+14
* | | | | Merge branch 'jk/maint-tag-show-fixes' into maintJunio C Hamano2012-02-132-32/+53
|\ \ \ \ \
| * | | | | tag: do not show non-tag contents with "-n"jk/maint-tag-show-fixesJunio C Hamano2012-02-082-10/+25
| * | | | | tag: die when listing missing or corrupt objectsJeff King2012-02-061-1/+5
| * | | | | tag: fix output of "tag -n" when errors occurJeff King2012-02-061-32/+34
| | |_|/ / | |/| | |
* | | | | Merge branch 'bw/inet-pton-ntop-compat' into maintJunio C Hamano2012-02-132-12/+0
|\ \ \ \ \
| * | | | | Drop system includes from inet_pton/inet_ntop compatibility wrappersbw/inet-pton-ntop-compatBen Walton2012-02-052-12/+0
* | | | | | Merge branch 'mp/make-cleanse-x-for-exe' into maintJunio C Hamano2012-02-131-0/+3
|\ \ \ \ \ \
| * | | | | | Explicitly set X to avoid potential build breakagemp/make-cleanse-x-for-exeMichael Palimaka2012-02-091-0/+3
* | | | | | | Merge branch 'jn/merge-no-edit-fix' into maintJunio C Hamano2012-02-132-3/+19
|\ \ \ \ \ \ \
| * | | | | | | merge: do not launch an editor on "--no-edit $tag"jn/merge-no-edit-fixJunio C Hamano2012-02-092-3/+19
* | | | | | | | Update draft release notes to 1.7.9.1Junio C Hamano2012-02-131-3/+19
* | | | | | | | Merge branch 'js/add-e-submodule-fix' into maintJunio C Hamano2012-02-131-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | add -e: do not show difference in a submodule that is merely dirtyjs/add-e-submodule-fixJohannes Schindelin2012-02-071-0/+1
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'jc/parse-date-raw' into maintJunio C Hamano2012-02-134-1/+60
|\ \ \ \ \ \ \ \
| * | | | | | | | parse_date(): '@' prefix forces git-timestampjc/parse-date-rawJunio C Hamano2012-02-034-2/+32
| * | | | | | | | parse_date(): allow ancient git-timestampJunio C Hamano2012-02-031-0/+29
* | | | | | | | | Merge branch 'jc/merge-ff-only-stronger-than-signed-merge' into maintJunio C Hamano2012-02-132-1/+15
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | merge: do not create a signed tag merge under --ff-only optionjc/merge-ff-only-stronger-than-signed-mergeJunio C Hamano2012-02-052-1/+15
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'jc/branch-desc-typoavoidance' into maintJunio C Hamano2012-02-133-4/+61
|\ \ \ \ \ \ \ \
| * | | | | | | | branch --edit-description: protect against mistyped branch namejc/branch-desc-typoavoidanceJunio C Hamano2012-02-052-4/+52
| * | | | | | | | tests: add write_script helper functionJunio C Hamano2012-02-031-0/+9
| |/ / / / / / /
* | | | | | | | Merge branch 'jn/rpm-spec' into maintJunio C Hamano2012-02-131-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | git.spec: Workaround localized messages not put in any RPMjn/rpm-specJakub Narebski2012-02-031-0/+1
| |/ / / / / / /
* | | | | | | | t: use sane_unset instead of unsetÆvar Arnfjörð Bjarmason2012-02-136-10/+10