summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* contrib/completion: "local var=()" is misinterpreted as func-decl by zsham/completion-zsh-fixAlex Merry2012-03-211-1/+2
* Merge branch 'fc/zsh-completion'Junio C Hamano2012-02-121-56/+11
|\
| * completion: simplify __gitcomp and __gitcomp_nl implementationsfc/zsh-completionFelipe Contreras2012-02-061-16/+3
| * completion: use ls -1 instead of rolling a loop to do that ourselvesFelipe Contreras2012-02-061-37/+2
| * completion: work around zsh option propagation bugFelipe Contreras2012-02-061-3/+6
* | Merge branch 'mp/make-cleanse-x-for-exe'Junio C Hamano2012-02-121-0/+3
|\ \
| * | Explicitly set X to avoid potential build breakagemp/make-cleanse-x-for-exeMichael Palimaka2012-02-091-0/+3
* | | Merge branch 'bw/inet-pton-ntop-compat'Junio C Hamano2012-02-122-12/+0
|\ \ \
| * | | Drop system includes from inet_pton/inet_ntop compatibility wrappersbw/inet-pton-ntop-compatBen Walton2012-02-052-12/+0
* | | | Merge branch 'jc/maint-commit-ignore-i-t-a'Junio C Hamano2012-02-122-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 'jk/maint-tag-show-fixes'Junio C Hamano2012-02-122-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 'mm/empty-loose-error-message'Junio C Hamano2012-02-121-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'Junio C Hamano2012-02-122-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 'jn/merge-no-edit-fix'Junio C Hamano2012-02-122-1/+14
|\ \ \ \ \ \
| * | | | | | 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.10Junio C Hamano2012-02-101-1/+22
* | | | | | | Merge branch 'js/add-e-submodule-fix'Junio C Hamano2012-02-101-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'Junio C Hamano2012-02-104-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'Junio C Hamano2012-02-102-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'Junio C Hamano2012-02-102-4/+52
|\ \ \ \ \ \ \
| * | | | | | | branch --edit-description: protect against mistyped branch namejc/branch-desc-typoavoidanceJunio C Hamano2012-02-052-4/+52
* | | | | | | | Merge branch 'jn/rpm-spec'Junio C Hamano2012-02-101-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | git.spec: Workaround localized messages not put in any RPMjn/rpm-specJakub Narebski2012-02-031-0/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jk/tests-write-script'Junio C Hamano2012-02-102-6/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | t0300: use write_script helperjk/tests-write-scriptJeff King2012-02-031-6/+2
| | |/ / / / / / | |/| | | | | |
| * | | | | | | tests: add write_script helper functionJunio C Hamano2012-02-031-0/+9
| |/ / / / / /
* | | | | | | Sync with maintJunio C Hamano2012-02-102-36/+17
|\ \ \ \ \ \ \
| * | | | | | | Update draft release notes to 1.7.9.1Junio C Hamano2012-02-101-0/+17
| * | | | | | | Merge branch 'jc/maint-request-pull-for-tag' into maintJunio C Hamano2012-02-103-8/+4
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'tr/grep-l-with-decoration' into maintJunio C Hamano2012-02-102-2/+25
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jl/submodule-re-add' into maintJunio C Hamano2012-02-102-0/+9
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'da/maint-mergetool-twoway' into maintJunio C Hamano2012-02-102-5/+35
| |\ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | Update draft release notes to 1.7.10Junio C Hamano2012-02-071-1/+12
* | | | | | | | | | | | Merge branch 'jc/maint-request-pull-for-tag'Junio C Hamano2012-02-073-8/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | request-pull: explicitly ask tags/$name to be pulledjc/maint-request-pull-for-tagJunio C Hamano2012-01-313-8/+4
* | | | | | | | | | | | Merge branch 'bl/gitweb-project-filter'Junio C Hamano2012-02-072-20/+95
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | gitweb: Make project search respect project_filterJakub Narebski2012-02-011-5/+13
| * | | | | | | | | | | | gitweb: improve usability of projects search formJakub Narebski2012-02-012-6/+28
| * | | | | | | | | | | | gitweb: place links to parent directories in page headerBernhard R. Link2012-02-011-1/+4