"untracked" is the right phrase for files new to git. For example
git-status uses this phrase. Also make the question shorter.
Signed-off-by: NBert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

Signed-off-by: NBert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

When staging a selection of files using Shift-Click to choose a range
of files then using Ctrl-T or the Stage To Commit menu item will stage
all the selected files. However if a non-sequential range is selected
using Ctrl-Click then all but the first name selected gets staged. This
commit fixes this to properly stage all selected files by explicitly
adding the path to the list before showing the diff.
Signed-off-by: NBert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

The view jumps now to the given line number after each key press.
Signed-off-by: NBert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

Signed-off-by: NBert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

Signed-off-by: NBert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

It was possible to open the search input (Ctrl+S) and the goto-line input
(Ctrl+G) at the same time. Prevent this.
Signed-off-by: NBert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

As a shortcut the "Stage Changed" button can be used to stage all current
changes in the worktree which are not set to ignore. Previously unknown
files would be ignored. The user might want to say: "Just save everything
in my worktree". To support this workflow we now ask whether the user also
wants to stage the unknown files if there are some present.
Signed-off-by: NHeiko Voigt <hvoigt@hvoigt.net>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

The 'n' binding should cause the next match to be selected but results
in the search field gaining focus and additional 'n's being appended.
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

Use forward-slash or Control-S to bring up the search dialog.
In the blame view, Enter or 'n' jump to the next selected region while
Shift-Enter or Shift-n will jump to the previous selected region.
Within the search control, hitting Enter will now jump to the next matching
region.
Signed-off-by: NDavid Fries <David@Fries.net>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

This patch adds a goto control similar to the search control currently
available. The goto control permits the user to specify a line number to
jump to.
When in blame, Control-G is bound to display this control.
Signed-off-by: NDavid Fries <David@Fries.net>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

On Windows the position of a window may be negative on a monitor to the
left of the primary display. A plus sign is used as the separator between
the width and height and the positional parts of the geometry so always
include the plus sign even for negative positions on this platform.
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

This typo was discovered in core git sources.
Clean in it up in git-gui too.
There is just one occurence in a comment line.
Signed-off-by: NDmitry Ivankov <divanorama@gmail.com>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

We do not have a mob branch and the i18n fork is no longer used. Suggest
translators simply send patches as per other contributors.
Reported-by: NRodrigo Rosenfeld <rr.rosas@gmail.com>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

The commandline is already warning when checking out a detached head.
Since the only thing thats potentially dangerous is to create commits
on a detached head lets warn in case the user is about to do that.
Signed-off-by: NHeiko Voigt <hvoigt@hvoigt.net>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

Reported-by: NChristoffer Pettersson <corgrath@gmail.com>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

The Tcl msgcat package doesn't detect the use of a multi-lingual language
pack on Windows 7. This means that a user may have their display language
set to Japanese but the system installed langauge was English.
This patch reads the relevent registry key to fix this before loading in
the locale specific parts of git-gui.
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

Signed-off-by: NSebastian Schuberth <sschuberth@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

Signed-off-by: NSebastian Schuberth <sschuberth@gmail.com>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>

The user might have got used to the order the remotes appeared previously.
Lets add the all entry last so the all entry does not confuse previous
users.
Signed-off-by: NHeiko Voigt <hvoigt@hvoigt.net>
Tested-by: NJens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

In case there is only one remote a fetch/prune all entry
is redundant.
Signed-off-by: NHeiko Voigt <hvoigt@hvoigt.net>
Tested-by: NJens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

The --all option for git fetch was added in v1.6.6 so ensure we have a usable version before adding
the menu items.
Sometimes people use tearoff menus and these offset the entry indices by one.
Acked-by: NHeiko Voigt <hvoigt@hvoigt.net>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

The commandline fetch already has this option for some time.  Since this
was not available at the time git gui was written lets implement it now.
Signed-off-by: NHeiko Voigt <heiko.voigt@mahr.de>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

Signed-off-by: NHeiko Voigt <heiko.voigt@mahr.de>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

This is useful if you are directly working together with other
developers pushing feature branches on a shared remote. You typically
push feature branches to the remote so others can review. Once they are
satisfied and the branch is merged into the main branch it needs to be
deleted on the server.

Since we did not yet have a preselected default branch in the remote
delete dialog lets use the last merged branch if it is found on the
server.
Signed-off-by: NHeiko Voigt <hvoigt@hvoigt.net>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

lsearch and lreplace both take the variable content as argument and not
just their name.
Signed-off-by: NHeiko Voigt <heiko.voigt@mahr.de>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

When starting git gui in a non-git directory it presents the user a
dialog which asks to create, clone or open a repository. The filedialogs
used to choose the path(s) would always default to the home directory of
the user. This patch changes this behavior and uses the current working
directory in which git gui was started as default.

This is useful in various cases. First being that the user starts the
gui in some directory and can go search to create, open or clone a
repository from there. Another use case is that tools like filemanager
context menues can transport a natural default when selected from a
folder.

Users who like to have their home folder as a default can fall back on
starting git gui with its working directory set to the home folder.
Signed-off-by: NHeiko Voigt <hvoigt@hvoigt.net>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

If the list of remote/local branches is very long its inconvenient
to scroll down and find the selected branch. This patch makes the
widget automatically scroll down so its shown on the top.
Signed-off-by: NHeiko Voigt <hvoigt@hvoigt.net>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

The selection of the branch to be pushed would be cleared when
the remote was changed. This seems to be dependent on the fact that
the selected content in the combobox was exported to the clipboard. It
was only apparent when using the new ttk widget.
Signed-off-by: NHeiko Voigt <hvoigt@hvoigt.net>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

Signed-off-by: NBert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

These two also stop the diff header.
Signed-off-by: NBert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

Signed-off-by: NBert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

Signed-off-by: NBert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

Signed-off-by: NBert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

and rename them only in the diff header
Signed-off-by: NBert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

Signed-off-by: NBert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

The fix in ca53c3fd (Fix diff parsing for lines starting with "--" or "++",
2008-09-05) got a bug report from Johannes Sixt, that new files in the
index now looks like:

  new file mode 100644
  --- /dev/null
  +++ b/foo
  @@ -0,0 +1 @@
  +foo

The introduced problem was that the 'in-diff-header'-flag was unconditially
disabled. Now it is only disabled when a hunk line is detected. And also
re-enabled when we encounter a new diff header.

The second part solves also the issue reported by me for diffs with file
type changes (i.e. the ''error: Unhandled 2 way diff marker: {d}"', which
comes from the second 'diff --git' line).
Reported-by: NJohannes Sixt <j.sixt@viscovery.net>
Reported-by: NBert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: NBert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

Support the following states with type change in git-gui: AT, MT, TD, TM
Signed-off-by: NBert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>

$s will be referenced in the error message. Which was broken since
"git-gui: Automatically update-index all included files before commit"
(bbe3b3b9, 2006-11-16).
Signed-off-by: NBert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: NPat Thoyts <patthoyts@users.sourceforge.net>