summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* configure: be more idiomaticsl/autoconfStefano Lattarini2012-03-261-89/+87
* configure: avoid some code repetitions thanks to m4_{push,pop}defStefano Lattarini2012-03-261-12/+14
* configure: move definitions of private m4 macros before AC_INIT invocationStefano Lattarini2012-03-261-12/+13
* Merge gitk changes from Paul Mackerras at git://ozlabs.org/~paulus/gitkJunio C Hamano2012-03-241-130/+282
|\
| * gitk: Teach gitk to respect log.showrootMarcus Karlsson2012-03-241-1/+9
| * gitk: Add menu items for comparing a commit with the marked commitPaul Mackerras2012-03-231-9/+29
| * gitk: Speed up resolution of short SHA1 idsPaul Mackerras2012-03-191-5/+27
| * gitk: Use symbolic font names "sans" and "monospace" when availableJonathan Nieder2012-03-191-0/+5
| * gitk: Skip over AUTHOR/COMMIT_DATE when searching all fieldsFrédéric Brière2012-03-191-2/+4
| * gitk: Make "git describe" output clickable, tooJim Meyering2012-03-191-1/+5
| * gitk: Fix the display of files when filtered by pathPat Thoyts2012-03-191-11/+27
| * gitk: Use a tabbed dialog to edit preferencesPat Thoyts2012-03-191-100/+164
| * gitk: Use "gitk: repo-top-level-dir" as window titleZbigniew Jędrzejewski-Szmek2012-03-191-1/+12
* | Git 1.7.10-rc2v1.7.10-rc2Junio C Hamano2012-03-232-2/+18
* | .mailmap: unify various old mail addresses of gitsterJunio C Hamano2012-03-231-1/+7
* | Merge branch 'am/completion-zsh-fix'Junio C Hamano2012-03-231-1/+2
|\ \
| * | contrib/completion: "local var=()" is misinterpreted as func-decl by zsham/completion-zsh-fixAlex Merry2012-03-211-1/+2
* | | Merge branch 'dw/gitweb-doc-grammo'Junio C Hamano2012-03-231-2/+2
|\ \ \
| * | | Documentation/gitweb: trivial English fixesdw/gitweb-doc-grammoD Waitzman2012-03-231-2/+2
* | | | Merge branch 'maint'Junio C Hamano2012-03-200-0/+0
|\ \ \ \
| * \ \ \ Merge branch 'maint-1.7.8' into maintJunio C Hamano2012-03-205-16/+34
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'ks/sort-wildcard-in-makefile' into maint-1.7.8Junio C Hamano2012-03-201-3/+3
| | |\ \ \
| | * \ \ \ Merge branch 'jc/advise-i18n' into maint-1.7.8Junio C Hamano2012-03-202-12/+20
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'jn/gitweb-unspecified-action' into maint-1.7.8Junio C Hamano2012-03-202-1/+11
| | |\ \ \ \ \
* | | \ \ \ \ \ Merge branch 'ab/perl-i18n'Junio C Hamano2012-03-162-3/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | perl/Makefile: install Git::I18N under NO_PERL_MAKEMAKERab/perl-i18nÆvar Arnfjörð Bjarmason2012-03-161-2/+5
| * | | | | | | | Git::I18N: compatibility with perl <5.8.3Ævar Arnfjörð Bjarmason2012-03-101-1/+10
* | | | | | | | | Update draft release notes to 1.7.10Junio C Hamano2012-03-161-1/+10
* | | | | | | | | Merge branch 'th/mergetools-deltawalker'Junio C Hamano2012-03-161-2/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Documentation/difftool: add deltawalker to list of valid diff toolsth/mergetools-deltawalkerTim Henigan2012-03-151-2/+3
* | | | | | | | | | Merge branch 'jc/maint-verify-objects-remove-pessimism'Junio C Hamano2012-03-161-4/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | fetch/receive: remove over-pessimistic connectivity checkjc/maint-verify-objects-remove-pessimismJunio C Hamano2012-03-151-4/+4
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'sl/customize-sane-tool-path'Junio C Hamano2012-03-161-0/+17
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | configure: allow user to prevent $PATH "sanitization" on Solarissl/customize-sane-tool-pathStefano Lattarini2012-03-091-0/+17
* | | | | | | | | | | Merge "two fixes for fast-import's 'ls' command" from JonathanJunio C Hamano2012-03-162-0/+43
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fast-import: don't allow 'ls' of path with empty componentsjn/maint-fast-import-empty-lsJonathan Nieder2012-03-092-0/+41
| * | | | | | | | | | | fast-import: leakfix for 'ls' of dirty treesJonathan Nieder2012-03-091-0/+2
* | | | | | | | | | | | Merge branch 'th/git-diffall'Junio C Hamano2012-03-151-28/+24
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | contrib/diffall: fix cleanup trap on Windowsth/git-diffallTim Henigan2012-03-141-4/+3
| * | | | | | | | | | | | contrib/diffall: eliminate duplicate while loopsTim Henigan2012-03-141-15/+9
| * | | | | | | | | | | | contrib/diffall: eliminate use of tarTim Henigan2012-03-141-4/+8
| * | | | | | | | | | | | contrib/diffall: create tmp dirs without mktempTim Henigan2012-03-141-7/+4
| * | | | | | | | | | | | contrib/diffall: comment actual reason for 'cdup'Tim Henigan2012-03-141-1/+3
* | | | | | | | | | | | | Merge branch 'th/doc-diff-submodule-option'Junio C Hamano2012-03-151-5/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Documentation/diff-options: reword description of --submodule optionth/doc-diff-submodule-optionTim Henigan2012-03-141-5/+6
* | | | | | | | | | | | | | Git 1.7.10-rc1v1.7.10-rc1Junio C Hamano2012-03-142-4/+12
* | | | | | | | | | | | | | Merge branch 'jc/i18n-shell-script-gettext'Junio C Hamano2012-03-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | i18n: fix auto detection of gettext scheme for shell scriptsjc/i18n-shell-script-gettextJunio C Hamano2012-03-121-1/+1
* | | | | | | | | | | | | | | Merge branch 'jc/maint-undefined-i18n-observation-test'Junio C Hamano2012-03-131-14/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | t0204: clarify the "observe undefined behaviour" testjc/maint-undefined-i18n-observation-testJunio C Hamano2012-03-091-14/+23