summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove git-diff-stages.Junio C Hamano2007-02-129-160/+2
* Remove git-resolve.Junio C Hamano2007-02-1211-59/+14
* blameview: Move the commit info to a pane below the blame window.Aneesh Kumar K.V2007-02-121-7/+26
* git merge documentation: -m is optionalMatthias Lederhofer2007-02-121-1/+1
* Make gitk save and restore window pane position on Linux and Cygwin.Mark Levedahl2007-02-121-10/+13
* Add RPM target for git-guiJunio C Hamano2007-02-121-3/+23
* Link git-gui into the master Makefile.Shawn O. Pearce2007-02-121-2/+8
* Merge branch 'master' of git://repo.or.cz/git-guiJunio C Hamano2007-02-123-19/+58
|\
| * git-gui: Change base version to 0.6.gitgui-0.6.0Shawn O. Pearce2007-02-121-1/+1
| * git-gui: Guess our version accurately as a subproject.Shawn O. Pearce2007-02-121-4/+37
| * git-gui: Handle gitgui tags in version gen.Shawn O. Pearce2007-02-121-5/+3
| * git-gui: Generate a version file on demand.Shawn O. Pearce2007-02-121-1/+5
| * git-gui: Rename GIT_VERSION to GITGUI_VERSION.Shawn O. Pearce2007-02-123-6/+6
| * git-gui: Allow gitexecdir, INSTALL to be set by the caller.Shawn O. Pearce2007-02-121-3/+7
* | import-tars: brown paper bag fix for file mode.Michael Loeffler2007-02-121-3/+1
* | fast-import: Support reusing 'from' and brown paper bag fix reset.Shawn O. Pearce2007-02-123-14/+77
* | Merge git-guiJunio C Hamano2007-02-115-0/+6065
|\ \ | |/
| * git-gui: Stop deleting gitk preferences.Shawn O. Pearce2007-02-111-8/+0
| * git-gui: Focus into blame panels on Mac OS.Shawn O. Pearce2007-02-091-1/+3
| * git-gui: Improve annotated file display.Shawn O. Pearce2007-02-091-22/+72
| * git-gui: Jump to the first annotation block as soon as its available.Shawn O. Pearce2007-02-081-1/+6
| * git-gui: Redesign the display of annotated files.Shawn O. Pearce2007-02-081-199/+160
| * git-gui: Use git-config now over git-repo-config.Shawn O. Pearce2007-02-081-8/+8
| * git-gui: Relabel the Add All action.Shawn O. Pearce2007-02-081-2/+2
| * git-gui: Select subcommands like git does.Shawn O. Pearce2007-02-081-13/+35
| * git-gui: View blame from the command line.Shawn O. Pearce2007-02-081-84/+136
| * git-gui: Optionally save commit buffer on exit.Shawn O. Pearce2007-02-081-26/+28
| * git-gui: Separate transport/branch menus from multicommit.Shawn O. Pearce2007-02-081-7/+12
| * git-gui: Refactor single_commit to a proc.Shawn O. Pearce2007-02-081-14/+30
| * git-gui: Replace \ with \\ when showing paths.Shawn O. Pearce2007-02-081-0/+1
| * git-gui: Support keyboard traversal in browser.Shawn O. Pearce2007-02-081-38/+99
| * git-gui: Update known branches during rescan.Shawn O. Pearce2007-02-081-1/+6
| * git-gui: Assign background colors to each blame hunk.Shawn O. Pearce2007-01-291-13/+58
| * git-gui: Use a grid layout for the blame viewer.Shawn O. Pearce2007-01-291-63/+61
| * git-gui: Install column headers in blame viewer.Shawn O. Pearce2007-01-291-21/+74
| * git-gui: Display original filename and line number in blame.Shawn O. Pearce2007-01-291-1/+33
| * git-gui: Correctly handle spaces in filepaths.Shawn O. Pearce2007-01-291-2/+4
| * git-gui: Use -M and -C when running blame.Shawn O. Pearce2007-01-291-1/+3
| * git-gui: Allow users to edit user.name, user.email from options.Shawn O. Pearce2007-01-291-0/+6
| * git-gui: Display the current branch name in browsers.Shawn O. Pearce2007-01-291-3/+3
| * git-gui: Improve the icons used in the browser display.Shawn O. Pearce2007-01-291-18/+26
| * git-gui: Implemented file browser and incremental blame.Shawn O. Pearce2007-01-291-0/+459
| * git-gui: Test for Cygwin differently than from Windows.Shawn O. Pearce2007-01-291-34/+104
| * git-gui: Offer quick access to the HTML formatted documentation.Shawn O. Pearce2007-01-291-4/+44
| * git-gui: Reword meaning of merge.summary.Shawn O. Pearce2007-01-271-6/+2
| * git-gui: Support merge.summary, merge.verbosity.Shawn O. Pearce2007-01-261-27/+50
| * git-gui: Always offer scrollbars for branch lists.Shawn O. Pearce2007-01-261-7/+13
| * git-gui: Don't allow merges in the middle of other things.Shawn O. Pearce2007-01-261-0/+15
| * git-gui: Don't allow users to commit a bad octopus merge.Shawn O. Pearce2007-01-261-4/+24
| * git-gui: Update status bar during a merge.Shawn O. Pearce2007-01-261-2/+4