summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge git-gui 0.14.0Junio C Hamano2011-03-2614-437/+3371
|\
| * Merge branch 'ss/git-gui-mergetool'gitgui-0.14.0Pat Thoyts2011-03-251-47/+54
| |\
| | * mergetool--lib: Add Beyond Compare 3 as a toolSebastian Schuberth2011-02-271-0/+7
| | * mergetool--lib: Sort tools alphabetically for easier lookupSebastian Schuberth2011-02-271-47/+47
| * | git-gui: detect the use of MUI langauge packs on WindowsPat Thoyts2011-03-251-0/+19
| * | git-gui: fetch/prune all entry appears lastHeiko Voigt2011-02-241-12/+10
| * | git-gui: fetch/prune all entry only for more than one entryHeiko Voigt2011-02-241-2/+2
| * | git-gui: Include version check and test for tearoff menu entryPat Thoyts2011-02-151-10/+14
| * | git-gui: teach fetch/prune menu to do it for all remotesHeiko Voigt2011-02-142-0/+74
| * | git-gui: refactor remote submenu creation into subroutineHeiko Voigt2011-02-141-16/+24
| * | git-gui: always default to the last merged branch in remote deleteHeiko Voigt2011-02-133-1/+14
| * | git-gui: fix deleting item from all_remotes variableHeiko Voigt2011-02-131-2/+2
| * | git-gui: instead of defaulting to home directory use working directoryHeiko Voigt2011-02-061-11/+3
| * | git-gui: scroll down to default selection for push dialogHeiko Voigt2011-02-061-0/+1
| * | git gui: keep selected branch when remote is changed in push dialogHeiko Voigt2011-02-061-1/+3
| * | git-gui: handle meta diff header lines only in the header sectionBert Wesarg2011-01-281-7/+2
| * | git-gui: handle special content lines only in the diff header sectionBert Wesarg2011-01-281-6/+9
| * | git-gui: always reset the current tagBert Wesarg2011-01-281-1/+2
| * | git-gui: move 3way diff autodetect upBert Wesarg2011-01-281-3/+4
| * | git-gui: there is no "mode *" diff header lineBert Wesarg2011-01-281-2/+1
| * | git-gui: name also new symlinks soBert Wesarg2011-01-281-3/+5
| * | git-gui: handle index lines only in the diff headerBert Wesarg2011-01-281-2/+2
| * | git-gui: rework handling of diff headerBert Wesarg2011-01-281-3/+15
| * | git-gui: learn more type change statesBert Wesarg2011-01-283-5/+19
| * | git-gui: remove 'no such variable' for s error when encounter unknown file st...Bert Wesarg2011-01-281-1/+2
| * | git-gui: fix typo in image dataBert Wesarg2011-01-281-2/+2
| * | git-gui: add Brazilian Portuguese (pt-BR) translationAlexandre Erwin Ittner2011-01-272-0/+2737
| * | git-gui: update russian translationAlex Riesen2011-01-241-1/+1
| * | git-gui: update russian translationAlex Riesen2011-01-241-288/+307
| * | git-gui: spelling fixes in russian translationSkip2011-01-241-12/+12
| * | git-gui: fix russian translation typosSerge Ziryukin2011-01-241-2/+2
| * | git-gui: use --exclude-standard to check for untracked filesStefan Naewe2010-12-101-7/+11
| * | git-gui: Fix use of hunk tag for non-hunk content.Bert Wesarg2010-12-062-7/+9
| * | git-gui: Fix use of renamed tag.Bert Wesarg2010-12-061-4/+4
| * | git-gui: fix browsers [Up To Parent] in sub-sub-directories.Bert Wesarg2010-11-221-1/+1
| * | git-gui: respect conflict marker sizeBert Wesarg2010-11-192-7/+25
| * | git-gui: fix ANSI-color parsingBert Wesarg2010-11-191-2/+10
| |/
* | Sync with 1.7.4.2Junio C Hamano2011-03-252-2/+11
|\ \
| * | Git 1.7.4.2v1.7.4.2Junio C Hamano2011-03-252-1/+8
| * | gitweb: Fix handling of fractional timezones in parse_dateJakub Narebski2011-03-251-2/+4
* | | t7607: clean up stray untracked fileJeff King2011-03-251-1/+2
* | | t7607: mark known breakage in test 11 as fixedJeff King2011-03-251-1/+1
* | | Merge branch 'kc/gitweb-pathinfo-w-anchor'Junio C Hamano2011-03-231-7/+20
|\ \ \
| * | | gitweb: fix #patchNN anchors when path_info is enabledKevin Cernekee2011-03-181-7/+20
* | | | Merge branch 'jn/fortify-source-workaround'Junio C Hamano2011-03-231-6/+11
|\ \ \ \
| * | | | run-command: prettify -D_FORTIFY_SOURCE workaroundJonathan Nieder2011-03-171-6/+11
* | | | | Merge branch 'jn/maint-c99-format'Junio C Hamano2011-03-236-81/+26
|\ \ \ \ \
| * | | | | unbreak and eliminate NO_C99_FORMATJonathan Nieder2011-03-175-55/+4
| * | | | | mktag: avoid %td in format stringJonathan Nieder2011-03-171-26/+22
* | | | | | Merge branch 'lt/default-abbrev'Junio C Hamano2011-03-235-3/+23
|\ \ \ \ \ \