summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/checkout-orphan-warning'Junio C Hamano2011-03-262-1/+64
|\
| * checkout: tweak detached-orphan warning formatJeff King2011-03-201-1/+4
| * checkout: clear commit marks after detached-orphan checkJeff King2011-03-202-0/+26
| * checkout: add basic tests for detached-orphan warningJeff King2011-03-201-0/+34
* | Merge branch 'jc/maint-rerere-in-workdir'Junio C Hamano2011-03-264-2/+86
|\ \
| * | rerere: make sure it works even in a workdir attached to a young repositoryJunio C Hamano2011-03-234-2/+86
* | | Merge branch 'nd/index-doc'Junio C Hamano2011-03-261-0/+185
|\ \ \
| * | | doc: technical details about the index file formatJunio C Hamano2011-03-231-37/+57
| * | | doc: technical details about the index file formatNguyễn Thái Ngọc Duy2011-02-271-0/+165
* | | | Merge branch 'jc/fetch-progressive-stride'Junio C Hamano2011-03-261-3/+18
|\ \ \ \
| * | | | fetch-pack: use smaller handshake window for initial requestJunio C Hamano2011-03-201-2/+4
| * | | | fetch-pack: progressively use larger handshake windowsJunio C Hamano2011-03-201-1/+6
| * | | | fetch-pack: factor out hardcoded handshake window sizeJunio C Hamano2011-03-201-3/+11
* | | | | Merge branch 'svn-fe' of git://repo.or.cz/git/jrnJunio C Hamano2011-03-2611-83/+156
|\ \ \ \ \
| * | | | | vcs-svn: handle log message with embedded NULJonathan Nieder2011-03-266-13/+94
| * | | | | vcs-svn: avoid unnecessary copying of log message and authorJonathan Nieder2011-03-261-10/+10
| * | | | | vcs-svn: remove buffer_read_stringJonathan Nieder2011-03-265-48/+17
| * | | | | vcs-svn: make reading of properties binary-safeJonathan Nieder2011-03-262-14/+37
* | | | | | 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