summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Use .git/MERGE_MSG in cherry-pick/revertShawn O. Pearce2007-05-081-11/+6
* Merge branch 'maint'Junio C Hamano2007-05-084-10/+42
|\
| * GIT v1.5.1.4v1.5.1.4Junio C Hamano2007-05-083-2/+32
| * Add howto files to rpm packages.Quy Tonthat2007-05-081-1/+4
| * wcwidth redeclarationAmos Waterland2007-05-071-2/+2
| * user-manual: fix clone and fetch typosJ. Bruce Fields2007-05-071-7/+6
* | Remove duplicate exports from MakefileShawn O. Pearce2007-05-071-1/+1
* | Merge branch 'master' of git://repo.or.cz/git-guiShawn O. Pearce2007-05-0718-4020/+4008
|\ \
| * | git-gui: Use vi-like keys in merge dialoggitgui-0.7.0-rc1Shawn O. Pearce2007-05-071-6/+14
| * | git-gui: Include commit id/subject in merge choicesShawn O. Pearce2007-05-071-45/+54
| * | git-gui: Show all possible branches for mergeShawn O. Pearce2007-05-071-7/+13
| * | git-gui: Move merge support into a namespaceShawn O. Pearce2007-05-072-16/+21
| * | git-gui: Allow vi keys to scroll the diff/blame regionsShawn O. Pearce2007-05-072-0/+23
| * | git-gui: Move console procs into their own namespaceShawn O. Pearce2007-05-074-39/+57
| * | git-gui: Refactor into multiple files to save my sanityShawn O. Pearce2007-05-0717-3792/+3836
| * | git-gui: Track our own embedded values and rebuild when they changeShawn O. Pearce2007-05-022-2/+16
| * | git-gui: Refactor to use our git proc more oftenShawn O. Pearce2007-05-021-11/+12
| * | git-gui: Use option database defaults to set the fontShawn O. Pearce2007-05-021-256/+114
| * | git-gui: Cleanup common font handling for font_uiShawn O. Pearce2007-05-021-38/+21
| * | git-gui: Correct line wrapping for too many branch messageShawn O. Pearce2007-05-021-5/+2
| * | git-gui: Warn users before making an octopus mergeShawn O. Pearce2007-05-021-0/+13
| * | git-gui: Include the subject in the status bar after commitShawn O. Pearce2007-05-021-3/+4
* | | Use GIT_OBJECT_DIR for temporary files of pack-objectsAlex Riesen2007-05-071-6/+8
* | | Fix minor documentation errorsMichael Spang2007-05-072-3/+3
* | | t7300: Basic tests for git-cleanMichael Spang2007-05-071-0/+180
* | | dir.c: Omit non-excluded directories with dir->show_ignoredMichael Spang2007-05-071-1/+6
* | | Merge branch 'master' of git://repo.or.cz/git-guiJunio C Hamano2007-05-071-20/+26
|\ \ \ | |/ /
| * | Merge branch 'maint'Shawn O. Pearce2007-05-021-1/+1
| |\ \
| * | | git-gui: Correctly handle UTF-8 encoded commit messagesShawn O. Pearce2007-04-241-20/+26
* | | | Merge branch 'maint'Junio C Hamano2007-05-075-81/+205
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'maint' of git://repo.or.cz/git-gui into maintJunio C Hamano2007-05-071-1/+1
| |\ \ \ | | | |/ | | |/|
| | * | git-gui: Allow spaces in path to 'wish'Shawn O. Pearce2007-05-021-1/+1
| * | | Merge git://git2.kernel.org/pub/scm/gitk/gitk into maintJunio C Hamano2007-05-071-0/+17
| |\ \ \
| | * | | gitk: Allow user to choose whether to see the diff, old file, or new filePaul Mackerras2007-04-191-0/+17
| * | | | Documentation: don't reference non-existent 'git-cvsapplycommit'Jeff King2007-05-061-1/+1
| * | | | user-manual: stop deprecating the manualJ. Bruce Fields2007-05-071-4/+3
| * | | | user-manual: miscellaneous editingJ. Bruce Fields2007-05-071-35/+47
| * | | | user-manual: fix .gitconfig editing examplesJ. Bruce Fields2007-05-071-4/+3
| * | | | user-manual: clean up fast-forward and dangling-objects sectionsJ. Bruce Fields2007-05-071-33/+40
| * | | | user-manual: add section ID'sJ. Bruce Fields2007-05-071-2/+82
| * | | | user-manual: more discussion of detached heads, fix typosJ. Bruce Fields2007-05-071-5/+15
* | | | | Added a reference to git-add in the documentation for git-update-indexMatthieu Moy2007-05-071-1/+5
* | | | | Document git add -u introduced earlier.Matthieu Moy2007-05-071-1/+5
* | | | | GIT v1.5.2-rc2v1.5.2-rc2Junio C Hamano2007-05-062-2/+2
* | | | | Merge branch 'maint'Junio C Hamano2007-05-0610-58/+253
|\ \ \ \ \ | |/ / / /
| * | | | Small correction in reading of commit headersAlex Riesen2007-05-051-1/+3
| * | | | Documentation: fix typo in git-remote.txtJames Bowes2007-05-051-1/+1
| * | | | Add test for blame corner cases.Junio C Hamano2007-05-051-0/+132
| * | | | blame: -C -C -CJunio C Hamano2007-05-051-2/+13
| * | | | blame: Notice a wholesale incorporation of an existing file.Junio C Hamano2007-05-051-12/+40