repo.or.cz
/
git
/
mingw.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'maint'
2009-04-08
S
h
awn O
.
Pearce
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2009-04-08
Ferry Hub
e
rts
git-gui
:
Ens
u
re consi
s
tent usage of mergetool
.
keep
B
ackup
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2009-04-08
Joerg Bornemann
git-
g
ui:
f
ix us
e
of unde
c
lared
vari
a
ble diff_empty_cou
n
t
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2009-04-05
Markus Heidelberg
git-gu
i
(
W
i
n
):
make startin
g
via "
G
it GUI Her
e
" on
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2009-04-05
Markus Heid
e
l
berg
git-gui (Win): make "E
x
plo
r
e Wor
k
ing Copy" more ro
b
u
s
t
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2009-04-05
Jens Lehmann
git-gui: r
u
n post-
c
h
e
c
kout hook on checkout
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2009-04-05
Jens Lehmann
git-g
u
i: W
h
en ca
l
ling pos
t
-commit hoo
k
wrong variable
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2009-04-05
Ma
r
kus Heidelberg
git-gui:
use `git --htm
l
-pat
h
`
t
o get the location
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2009-03-30
S
h
awn O
.
Pea
r
ce
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2009-03-30
Markus He
i
del
b
erg
git-gui: fix deleti
n
g from the context
m
e
n
u
w
ith e
m
pty
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2009-03-24
Sam Hocevar
g
i
t-gui: minor spelling fix
a
nd
s
t
r
i
n
g
facto
r
isation
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2009-03-24
Sam H
o
ceva
r
gi
t
-g
u
i: various
French tran
s
lation fixes
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2009-03-20
Shawn
O
.
Pear
c
e
Merge bran
c
h 'maint
'
commit
|
commitdiff
|
tree
2009-03-20
J
e
ns Lehmann
git-gui: Fix merge conflict
d
isplay er
r
o
r
w
h
e
n filename
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2009-03-17
Shawn O
.
P
earce
M
e
rge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2009-03-17
Markus He
i
delbe
r
g
git-gui:
don't h
i
d
e
the Browse button
when resizing
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2009-03-09
Phil L
a
w
r
ence
Append ampe
r
s
and to "Targe
t
"
o
f
lnk fi
l
e
s
c
reated b
y
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2009-02-08
Al
e
xan
d
er Gavrilov
g
i
t
-
gui: Support mor
e
git
v
e
rsion n
o
tations
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2009-02-08
Alexander Gavr
i
lov
git-
g
ui: Avoid an infin
i
te rescan loop in handle_empty_
d
iff
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2009-02-01
Ale
x
a
n
d
e
r Gavrilov
git-gui: Fix po
s
t-commit status
w
ith subj
e
c
t in n
o
n
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-12-18
Sha
w
n O
.
Pea
r
ce
git-gui 0
.
12
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-12-17
Johannes Schindelin
git-gui: Get ri
d
of t
h
e last re
m
nants
o
f GIT_CONFIG_LOC
A
L
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-12-10
Miklos Vajna
git-gui: Upda
t
e Hungarian tran
s
lati
o
n for 0
.
12
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-12-10
Peter Krefting
git-gui: Fixed typo
s
in S
w
edish trans
l
ation
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-12-09
Peter Krefting
git
-
gui: Updat
e
d
Swedish translation (515t0f0u)
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-12-09
Michele Ballab
i
o
git g
u
i: upd
a
t
e Italian trans
l
a
ti
o
n
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-12-09
N
a
nak
o
Shiraishi
git-gui:
U
p
d
ate Japanese translation for 0
.
12
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-12-08
Fredrik Sko
l
mli
gi
t
-g
u
i: Starti
n
g translation f
o
r No
r
wegian
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-12-08
C
h
ris
t
ian S
t
immi
n
g
git-gu
i
: Upda
t
e German (com
p
leted) translation
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-12-08
Shawn O
.
Pearce
gi
t
-
gui: Update po te
m
plate to
i
nclude 'Mir
r
oring
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-12-08
Alexande
r
G
a
vrilov
git-gui: Fix commit
e
ncodi
n
g handling
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-12-08
Alexander G
a
vrilov
git-gui:
F
ix
h
andl
i
ng of relative path
s
in blame
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-12-02
Ma
r
k Burton
git-
g
u
i
: Teach start_push_anywher
e
_action
{
} to notice
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-26
Nana
k
o
Shirais
h
i
git-gui: upd
a
t
e
Jap
a
nese
transl
a
tion
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-23
Christian Couder
g
i
t
-
g
u
i
: fre
n
ch t
r
ansla
t
i
o
n upda
t
e
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-21
Pet
e
r Krefting
Update
d
Swedish
translation
(514
t
0f0u)
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-19
Miche
l
e B
a
llabio
g
i
t gui: up
d
ate Italian translation
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-18
Miklos Vajna
Upda
t
e Hung
a
rian transla
t
ion
.
100%
complet
e
d
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-16
A
lexander
G
av
r
ilov
g
i
t
-
gui:
F
ix the
s
e
ar
c
h bar destr
u
ction handler
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-16
Sh
a
wn
O
.
Pearce
Update t
h
e po template
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-16
Alexand
e
r Gav
r
i
l
ov
git-gui: Im
p
lement automatic rescan after Tool
e
xecution
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-16
Alexander Gavrilov
gi
t
-gui: Allow Too
l
s request
arguments fro
m
the u
s
e
r
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-16
Alexander G
a
v
r
ilov
git-gui: Add a To
o
ls
m
enu for arbitr
a
ry commands
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-16
A
l
exa
n
der
Gavrilov
git-g
u
i: Fix the
aft
e
r callback e
x
ecu
t
ion
i
n rescan
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-16
Alexande
r
Gavri
l
o
v
git-
g
ui: Implement system
-
wide configuration hand
l
i
n
g
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-16
Giuseppe
Bilott
a
git-gui: try to provide a window icon under
X
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-11
Alexande
r
Gavrilov
git-gui: Req
u
est blame metadata in utf-8
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-11
Alexander Gavrilov
git-gui: Ad
d
the S
h
ow SSH Key i
t
e
m
to the
c
lone d
i
alog
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-11
Alexande
r
G
avrilov
git-gui: Fix
f
ocus transition in the blame viewer
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-02
Christian
S
timming
git-gui:
Update German tr
a
nslation
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-01
Johannes Six
t
git-gui: D
o
not munge
conflict marker
l
i
n
e
s
in
a
n
ormal
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-01
Alex
a
nder Gav
r
ilov
git-gui
:
Add a simpl
e
implement
a
tion
of SSH_ASKPASS
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-01
Alexander Gavrilov
git-
g
ui: Add a dialog that shows the
Ope
n
SSH public
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-10-10
J
o
hannes Sixt
g
i
t-gui:
M
ar
k
-up stri
n
gs in show_{othe
r
,unmerged}
_
d
iff
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-10-10
Johannes Sixt
g
it-gui: Show a round number of
b
ytes o
f
large
un
t
racked
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-10-10
Alexander
G
avrilov
g
i
t-
g
ui: Fix the bl
a
me viewer des
t
roy handle
r
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-10-10
Ale
x
ander G
a
vri
l
ov
git-gui
:
Add a
sear
c
h command to the blame
viewer
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-10-10
Alexander Gavrilov
git
-
gui: F
i
x the
b
lame w
i
ndow
s
hape
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-10-10
J
ohannes S
i
xt
git-
g
ui: Fix swi
t
c
h
sta
t
ement
i
n lib/mer
g
e
.
tc
l
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
Pet
r
Baudi
s
git-gui: Fix fetch
i
ng from remotes whe
n
ad
d
ing t
h
e
m
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
Petr Bau
d
is
gi
t
-gui: Fix removi
n
g no
n
-push
a
b
le remotes
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
Petr Baudis
git-gui:
M
ake in
p
ut boxes in
i
n
it/
c
lone/open dialo
g
s
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
Pe
t
r Baudis
git-gui: Avoid u
s
ing the term U
R
L
when specifying repositories
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
Petr Baudis
g
i
t-gui:
gui
.
au
t
o
e
xpl
o
r
e
makes
explorer t
o
pop up automatica
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
Pet
r
B
audis
git-gui: Add
Explor
e
Wor
k
ing
C
opy to the Repository
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
Petr Baudis
g
it-gui: Us
e
git web
-
-brows
e
r for web bro
w
sing
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
Petr Baudis
git
-
g
u
i
: mkdir
-p
w
hen initializin
g
new
remote repository
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
Pe
t
r Bau
d
is
git-gui: Add sup
p
o
rt for remov
i
ng rem
o
tes
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
Petr Baudis
git-gui: Add sup
p
o
r
t for
ad
d
i
n
g
r
e
m
ote
s
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
Petr
B
audis
git-
g
ui: Squash populate
_
{push,fetch}_
m
enu to populate
_
r
emot
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
P
etr
B
audis
git-g
u
i
:
Clarif
y
t
h
e Remote -
>
Delete
.
.
.
ac
t
ion
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
Johannes Sixt
git-gui: Remove space fr
o
m the
e
nd of aspell's reply
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
Alexander G
a
v
r
i
lov
g
i
t-gui: Make Ctrl
-
T sa
f
e to u
s
e
f
or co
n
fl
i
cting files
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
Johannes Sixt
g
it-
g
u
i
: Do
n
ot automatically st
a
ge file
a
fter merge
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-26
S
hawn O
.
Pearce
git-gui: Show/hide "Si
g
n Off
"
based on nocommitmsg
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-26
Shawn O
.
P
earce
Merge branch
'
mai
n
t'
commit
|
commitdiff
|
tree
2008-09-26
Gustaf
H
e
n
d
eby
git-gui:
H
elp iden
t
ify
a
spel
l
v
e
r
s
ion on
W
indows too
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Alexand
e
r Gavrilov
git-gui:
R
ee
n
able staging unmerged
files by clicki
n
g
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
A
l
exa
n
d
er
G
a
v
rilov
gi
t
-gui: Support the
encoding menu i
n
gui blame
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Alexander Gavril
o
v
git
-
gui: Optimiz
e
enc
o
ding
na
m
e re
s
o
lution using a
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Alexander Gavr
i
lov
git-gui
:
Allow forcing display encod
i
ng
for diffs using
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
A
lexander G
a
vrilo
v
g
i
t-gui: Add a menu of available encodings
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Al
e
xander Gavril
o
v
git-gui: Cl
e
a
n
up handling of the default encoding
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Shawn
O
.
Pearce
git-gui: Assu
m
e `blame
-
-inc
r
e
mental`
output is in
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Shawn
O
.
Pe
a
rce
g
it-gui: Use gitattr
i
bu
t
e
"enc
o
di
n
g" for file content
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Jos
h
u
a Willia
m
s
git-gui: A
d
d support for c
a
lling out to the prepare
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Shawn O
.
Pearce
git-gui: Hide
c
o
mm
i
t
r
e
lat
e
d UI during
ci
t
ool
--nocommit
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Alexander Gavrilov
git-gui: Add m
o
re integrat
i
o
n
options to citool
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-13
Christian
S
timming
g
it-gui:
U
pdated German
tran
s
lat
i
on
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-12
C
hri
s
tia
n
Stimming
git-
g
ui:
I
1
8
n fix
s
e
ntence parts into
f
ull sentences
.
.
.
Signed-off-by:
Shawn O. Pearce
<sop@google.com>
commit
|
commitdiff
|
tree
2008-09-12
Alexander Ga
v
rilov
gi
t
-gui: Restore
ab
i
lity to Stage Working Copy
f
o
r
.
.
.
Signed-off-by:
Shawn O. Pearce
<sop@google.com>
commit
|
commitdiff
|
tree
2008-09-12
Alexander Gavrilo
v
git-gui: Fix
B
la
m
e P
a
r
e
n
t & Conte
x
t for wo
r
kin
g
c
opy
.
.
.
Signed-off-by:
Shawn O. Pearce
<sop@google.com>
commit
|
commitdiff
|
tree
2008-09-05
Shaw
n
O
.
Pearce
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-09-05
Sha
w
n O
.
Pearce
git-gui
:
Fi
x
diff pars
i
ng for lines
starting wi
t
h
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-05
Alexa
n
der Gavrilov
git-gui: S
h
ow
s
p
e
cial diffs for
com
p
lex con
f
lict cas
e
s
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-05
Alexan
d
er
Gavrilov
git-gui: Ma
k
e F5 reselect a diff,
i
f
a
n untrac
k
ed file
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-05
Alexander G
a
vri
l
o
v
g
i
t-gui: Reimplement and enhance
auto-select
i
on of
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-05
Alexander Gavrilo
v
git
-
g
ui: S
u
p
po
r
t
co
n
f
l
i
ct stat
e
s
_
U
& UT
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-05
Ale
x
ander
G
a
vril
o
v
gi
t
-gui: Support more merge tools
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-05
Al
e
xander Ga
v
r
i
l
o
v
git-gu
i
: Don'
t
allow
staging files with
c
onflicts
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
next