stash pop accepts only explicit object (stash@{N})

Change-Id: Ie3d40173ffd94849bde30076235f65d5e4e92cc2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

If remote HEAD commit is referenced by multiple branches, only the last
one is currently listed

Change-Id: Iac689125610aaf49c0bc31285a0d283fd48a271c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: I5610ce9117c997a82ce8d28ff2440bebd28d9181
Reviewed-by: hjk <hjk121@nokiamail.com>

Change-Id: I75bb18c9564ffac3de2654bd388465794481b487
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: Ib83ca453c86b93cb359a2a0a9774c7d39533be4e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: I398437db96082e8813090b5eb78ae1c8b8158ffe
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: I238ef964df126a341c87dacf9344ff1570f31845
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Fix capitalization and punctualization of Git messages.

Change-Id: I76de86dc87727b17eca6d0deabc530f889fa284e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

We should using "i18n.logOutputEncoding" as we can.
In default, it should be 'utf-8'.

Change-Id: Ic5af2869e5fd5273a712f28e8e59149a4c2ef2b7
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>

Other refs can also be checked out using this function

Change-Id: I80a1c15244b1043cfce650a121c71174b9d322cb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: I6cb9752f435255379cf7a8a321b3192a410d91df
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: I7c9059396aaac78c769518b34c7bf68bfe9932ec
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>

Offers the user to stash changes (if relevant), stores
the results and pops the stash when it goes out of scope
(unless disabled)

Change-Id: Ibc0d2a5d3e3c953062fb17ecba903ca814524837
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

If the user created another stashed between save and
pop, this stash will be restored instead of the intended
one.

Change-Id: I605c9f440345d8c7e0876f4f60daa7146bebb212
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: I581afbe314055796d22f883e501dfb5fd17117fe
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

When flags are not used. syncStash doesn't return result,
which can be useful for StashGuard

Change-Id: I1327b5d8d10410e7a3b9fdb07a03b476d5abcdc4
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: I36c70fc3df5958b7bb5378e2529a451c497d6632
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: I5243fce895ae21a2b07cb9e0d98a60d69f848b10
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

... when the stash should be removed on successful pop

Change-Id: I39b2c01b0a518d3c70bcb8dc898191cca6d3e84d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

regression from 40eecd87

Change-Id: Ibbf4082f9949ca25d22d7ba707281ae6652249ce
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: Ic8ba7434e79b12eca680a67c2845c82915dc0088
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Better overview in stash dialog.

Change-Id: Icb6d3f8e2e068882e661e017ce8a0bb00ec6dba5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

This can ease adding commands that can cause conflicts like cherry-pick,
revert, merge, rebase, stash pop ...

Change-Id: Id9df7f11307dbbcb60036a20a2c22c5097ba239f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Rebase on pull should check if branch configuration has rebase set to
true. This is important to correctly abort operation when conflicts
appear, and user chooses not to run mergetool

Change-Id: I365aa534bdbece466514f542ea2e3c371c89a4a8
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Added Soft Reset to Reset Dialog

Change-Id: Iba5b6a37aef2b89c998c21a3d8ecca1075cbda10
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Might be disabled by configuration. Override it.

Change-Id: I262c5c34a840811b635b460c7759f4cfbe93ded6
Reviewed-by: Thorbjørn Lindeijer <bjorn@lindeijer.nl>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

#!/usr/bin/env ruby

Dir.glob('**/*.cpp') { |file|
  # skip ast (excluding paste, astpath, and canv'ast'imer)
  next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i
  s = File.read(file)
  next if s.include?('qlalr')
  orig = s.dup
  s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m|
    res = $&
    if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces
      res
    else
      res.gsub!('} else', 'else')
      res.gsub!(/\n +} *\n/m, "\n")
      res.gsub(/ *{$/, '')
    end
  }
  s.gsub!(/ *$/, '')
  File.open(file, 'wb').write(s) if s != orig
}

Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc
Reviewed-by: hjk <qthjk@ovi.com>

It might fail because a particular branch points to an invalid commit.
We don't want that to prevent display of all other branches.

Change-Id: I8fe427735351fc458c99396dc1f9d77bc948468e
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Added git functions - "Merge" and "Rebase"
They are in the "Branches" dialog:
- Merge - merge selected branch into current one
- Rebase - rebase current branch on selected one

Task-number: QTCREATORBUG-8367

Change-Id: I9ed306c64d5d4b7bd1d58730a5e1009f0bd4ec0e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

And use a capital D for Detached

Change-Id: I406269c6498be07d18b2febd0635984cff76b122
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Submodules are not stashed and are not considered a conflict after revert

Change-Id: I97a0792db615054622b9b67a7f6b58b5aee05273
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Default behavior is to show all untracked files. To hide them,
we need to pass --untracked-files=no

Change-Id: I45ad6323273112e6724127d4bd8e8687066467f4
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

It always fails and falls back to git/bin

Change-Id: I367ff33c864adebf438cbcc00332520ec6e0d454
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

rebase might fail for other reasons (detached head, unconfigured upstream...)

Change-Id: If80844dcbfd4f61fdd44d77f934e86ff96f0a1d3
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Launch gitk only for current file,
or for the folder that current file belongs to

Task-number: QTCREATORBUG-8327

Change-Id: I2ffbd44e3b3eeaffad32e84af9ca2085b16fdaa2
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Use "(detached)" instead

Change-Id: If1d295cb5dcfe2995e13c7b5b02b00bebf0e1b20
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: Ia517542242ce5a971728c4712190abaa0bbcb5a4
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: Ia22ec20d3934dbdfa42461f66230b62bf6c1df07
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

It is not used anywhere

Change-Id: I9884c4c015bc14cb78e35950c7544c8d004a73ca
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>