repo.or.cz
/
git
/
jrn.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
Shawn O
.
Pearce
M
e
rg
e
branch 'main
t
'
commit
|
commitdiff
|
tree
2009-04-08
F
e
rry
H
uberts
git-gui: Ensu
r
e consistent
u
sage of
m
ergetool
.
keepB
a
ckup
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2009-04-08
Jo
e
rg Bornema
n
n
git-
g
ui:
fix
u
se of unde
c
lared varia
b
le diff_empty_count
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2009-04-05
Markus Heidelberg
git-gui (Win): make starting via "Git GU
I
Here" on
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2009-04-05
Ma
r
kus Heidelberg
git-gui
(Win): make
"
Expl
o
re Worki
n
g Copy" mor
e
rob
u
st
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2009-04-05
Jens
L
e
hmann
git-gui:
r
un po
s
t-c
h
eckout hook on che
c
k
o
ut
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2009-04-05
Jens Le
h
mann
git-gui: When calling
post-commit
h
ook wrong variable
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2009-04-05
Markus Heidelbe
r
g
git-gui: use `git
--html-path` to
g
et the l
o
cation
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2009-03-30
Sha
w
n
O
.
Pearce
M
e
rg
e
bra
n
ch 'mai
n
t'
commit
|
commitdiff
|
tree
2009-03-30
Ma
r
kus
Heidelberg
git-gui: fix del
e
ting from
t
he context menu with
e
mpty
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2009-03-24
Sam Hocevar
git-g
u
i:
m
inor s
p
elling fix and string factorisation
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2009-03-24
Sam Hoce
v
ar
git-gui:
v
arious F
r
ench tr
a
n
slation fixes
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2009-03-20
Sha
w
n O
.
P
e
arce
Merge br
a
nch 'main
t
'
commit
|
commitdiff
|
tree
2009-03-20
Jens Lehmann
git
-
gui: Fix mer
g
e c
o
nflict display error w
h
en filename
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2009-03-17
Sha
w
n O
.
Pea
r
c
e
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2009-03-17
Mar
k
us H
e
ide
l
berg
git-gui:
d
on't hide the Br
o
wse button
when
r
esizing
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2009-03-09
Phi
l
Lawrence
Append amp
e
rsan
d
to
"Ta
r
get" of
lnk files created b
y
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2009-02-08
Alexander G
a
vrilov
git-gui: Suppo
r
t
m
ore
g
it
vers
i
on notations
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2009-02-08
A
l
exa
n
der Ga
v
rilov
git
-
gui:
A
void an
i
n
fini
t
e
r
escan
l
oop in handle_
e
mpty
_
d
if
f
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2009-02-01
Alexand
e
r Gavrilov
git-gui
:
Fix
post-com
m
it status with su
b
ject
i
n n
o
n
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-12-18
S
h
awn O
.
Pea
r
ce
git-gui 0
.
12
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-12-17
J
ohannes
Schind
e
lin
gi
t
-g
u
i
:
Get rid
o
f the la
s
t remnants
o
f
G
IT
_
CONFI
G
_L
O
CAL
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-12-10
Mi
k
los
V
a
jna
git-gui: Update Hungarian translation for 0
.
12
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-12-10
Peter K
r
e
f
ting
git-gui: Fixed typos
i
n Swedish tr
a
nslation
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-12-09
Pet
e
r
Krefting
git-gui:
U
p
da
t
ed Swed
i
sh tra
n
s
l
ation (515
t
0f0u)
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-12-09
M
ichele Ballabio
git gui:
u
p
d
a
t
e Itali
a
n translatio
n
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-12-09
Nanako S
h
irais
h
i
gi
t
-gui: Up
d
ate
Japane
s
e translation for 0
.
12
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-12-08
Fredrik Skolmli
git-gui:
Start
i
ng translation for
Norwegi
a
n
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-12-08
C
h
ri
s
tian St
i
mming
git-
g
ui: Update German (completed) translation
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-12-08
S
h
a
wn O
.
Pearce
gi
t
-gui: U
p
date po template to include
'M
i
r
r
o
r
ing
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-12-08
Al
e
xa
n
d
e
r Gavrilov
g
i
t-g
u
i: Fix
commit encoding handling
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-12-08
A
lex
a
nd
e
r Gavrilov
git-gui: Fix handling of r
e
l
a
tiv
e
paths in blame
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-12-02
Mark Burton
git-gu
i
: Teach sta
r
t
_
p
u
sh_anywh
e
re_action
{
} to notice
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-26
Nanako
S
hi
r
aishi
git
-
gu
i
:
u
pdate Japanes
e
tra
n
slation
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-23
Chris
t
ian Couder
git-gui: french tran
s
l
a
t
i
o
n
update
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-21
Peter K
r
efting
Upda
t
ed Sw
e
dish tran
s
lation (514
t
0f
0
u)
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-19
Mic
h
e
l
e Ball
a
bi
o
g
i
t
gui: updat
e
Italian
t
r
anslation
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-18
Mik
l
o
s
Vajna
Upda
t
e Hungari
a
n translat
i
on
.
100% completed
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-16
Alexander Ga
v
r
i
lov
git-gui
:
F
ix the s
e
arch
bar d
e
stru
c
ti
o
n handler
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-16
Sha
w
n O
.
Pearce
U
p
date the po
t
emplate
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-16
Alexander
G
avrilov
g
i
t-gui
:
Implement
a
utomatic res
c
an afte
r
Tool execut
i
o
n
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-16
Alexa
n
d
er Gavrilov
git-gui: Allow Tools
r
e
q
u
est argum
e
nts from the u
s
e
r
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-16
A
lexande
r
G
a
vr
i
lov
g
i
t
-
gui: Add a To
o
ls
m
enu for ar
b
itrary commands
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-16
Alexander Gavrilov
git-
g
ui:
F
ix the
a
fter cal
l
back execution in rescan
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-16
Alexander Ga
v
r
i
lov
git-gui: Imp
l
ement
s
y
stem-wide c
o
n
f
igurati
o
n handling
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-16
G
i
usep
p
e Bil
o
tta
git-gui: try to
provide
a
wind
o
w icon
u
n
d
e
r
X
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-11
Alexand
e
r Gavrilov
git-gui: R
e
quest blame metadata in ut
f
-8
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-11
Alexand
e
r Gavrilov
git-gui: Add the Show SSH Key item to the clo
n
e di
a
lo
g
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-11
Alexander Gavr
i
l
o
v
g
i
t-gui: Fix
focus
t
ransition in t
h
e blame viewer
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-02
Chr
i
stian S
t
i
m
m
ing
git-gui: Upd
a
te German translation
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-01
Joha
n
ne
s
Sixt
gi
t
-
g
u
i: Do
not munge conflic
t
m
arker l
i
nes in
a normal
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-01
Alexa
n
der
Gavrilov
git-gui: A
d
d
a sim
p
le
impl
e
men
t
a
t
ion of SSH_ASKPA
S
S
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-11-01
Al
e
xan
d
er Gavri
l
ov
git
-
gui
:
Add a di
a
log that sh
o
ws t
h
e
OpenSSH publ
i
c
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-10-10
Johanne
s
Sixt
git-gui
:
Mark-up strings i
n
s
h
o
w
_
{other,unmerged}_diff
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-10-10
Johann
e
s
S
ixt
g
i
t-gui: Show
a
round number of bytes of
l
arge untracked
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-10-10
Alexander G
a
vrilov
git-gui: Fix
t
h
e blame v
i
e
w
er d
e
stroy hand
l
e
r
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-10-10
Ale
x
ande
r
Gavrilov
gi
t
-gu
i
: Add
a
sear
c
h command to
th
e
blame viewer
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-10-10
Alexander G
a
vril
o
v
g
it-gui:
Fix the blame window shape
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-10-10
Jo
h
annes Sixt
git-gui: Fix switch statement in li
b
/merge
.
tcl
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
P
etr Baudis
gi
t
-gui: F
i
x fetc
h
ing fr
o
m
r
e
motes w
h
en adding them
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
Pet
r
Baudis
git-gui: Fix remov
i
ng n
o
n
-pushable r
e
motes
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
Petr Baudis
git
-
gui:
M
ake input b
o
xes in in
i
t
/
clone/open dialogs
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
Pe
t
r Baudis
git-g
u
i
: Avoid using the term URL
whe
n
sp
e
c
i
f
ying
r
epositorie
s
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
Petr Bau
d
is
git-gui: gui
.
auto
e
xplore makes expl
o
rer to
po
p
up
a
u
tom
a
tica
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
Petr
Baudis
git-gu
i
: A
d
d Explore Working Copy to
the Repos
i
tor
y
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
Petr Baudi
s
git-
g
ui:
U
se git web--browser fo
r
web b
r
owsing
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
Petr Baud
i
s
git
-
g
u
i: mkd
i
r
-p when in
i
tializing new remote repository
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
Petr Baudis
git-gu
i
: Add
supp
o
rt fo
r
removing remotes
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
Petr Bau
d
is
git
-
gui: Add support for adding remotes
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
P
etr Baudis
git-gui: Squash p
o
pulate_
{
p
ush,fetch}_men
u
to popu
l
ate_
r
emot
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
Petr
Bau
d
is
git-gui
:
C
lari
f
y
t
he Remote
-
> Del
e
te
.
.
.
ac
t
ion
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
J
o
hannes Six
t
git-g
u
i: Remo
v
e
s
p
ace from the end of asp
e
l
l's reply
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
Alexand
e
r Gavrilov
git-gui: Make C
t
r
l-T safe to
use for
c
onflicting files
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-30
Johannes Sixt
git-gui: Do not autom
a
tically stage file af
t
e
r
m
erge
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-26
S
h
awn O
.
Pearce
git-gui: Show
/
h
i
de
"
Sign Off" based on nocommitmsg
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-26
Shawn O
.
Pea
r
ce
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2008-09-26
G
u
staf Hend
e
by
g
i
t-gui: Help i
d
e
nti
f
y aspell versi
o
n on Windows
t
oo
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
A
lexander G
a
vril
o
v
g
i
t-gui: Ree
n
a
b
l
e
stagi
n
g unmerged files by cli
c
king
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Alexand
e
r
G
avrilo
v
git-gui: Suppo
r
t the en
c
o
ding menu in gui blame
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Alexander Ga
v
rilov
git-gui:
O
ptimize encod
i
ng name resoluti
o
n using a
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Alexander G
a
v
rilo
v
gi
t
-gui: Allow f
o
rcing di
s
play en
c
o
ding f
o
r dif
f
s using
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
A
l
exand
e
r Gavrilov
git-gui: A
d
d a m
e
nu o
f
a
v
ailable enco
d
ings
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Al
e
xander Gavr
i
lov
git-gui: Cl
e
anup
h
andling o
f
the d
e
fault enc
o
di
n
g
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Shawn O
.
P
e
arce
git-gui:
Assume `blame
--
i
ncremental` outp
u
t is i
n
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Sh
a
wn O
.
Pearce
git-gui: Use gitattribute
"
encoding" for file c
o
ntent
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Joshua Williams
git-gui:
Add sup
p
o
rt
for calling out
to
the prepare
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Shawn O
.
Pear
c
e
g
i
t
-gui: H
i
de commit related
UI durin
g
ci
t
ool --nocomm
i
t
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-24
Ale
x
ander G
a
vril
o
v
gi
t
-gui: Add
mor
e
integrat
i
o
n op
t
i
o
ns
to citool
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-13
Ch
r
istian
Stimming
git-gui:
U
p
d
a
te
d
German t
r
ansl
a
tion
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-12
Christian Stimming
git-gui: I
1
8n fix sentence
p
arts into ful
l
sentenc
e
s
.
.
.
Signed-off-by:
Shawn O. Pearce
<sop@google.com>
commit
|
commitdiff
|
tree
2008-09-12
Alexander Gavrilov
git-gui: Restore ability to
S
tage Working Co
p
y for
.
.
.
Signed-off-by:
Shawn O. Pearce
<sop@google.com>
commit
|
commitdiff
|
tree
2008-09-12
Alexander
Gavrilov
git-gu
i
: Fix Blame Par
e
nt &
C
o
ntext for working
c
opy
.
.
.
Signed-off-by:
Shawn O. Pearce
<sop@google.com>
commit
|
commitdiff
|
tree
2008-09-05
Shawn
O
.
Pearce
M
erge branch 'main
t
'
commit
|
commitdiff
|
tree
2008-09-05
Sh
a
wn
O
.
Pe
a
rce
git-gui: Fix d
i
ff
parsing for lines starting w
i
t
h
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-05
A
l
exander Ga
v
rilov
git-gui: S
h
ow s
p
eci
a
l
d
iffs fo
r
comp
l
ex
c
onf
l
ict cases
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-05
Alexander Gavril
o
v
git
-
gui: Make F5 rese
l
ect a diff, if an unt
r
acke
d
file
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-05
Alexander Gavrilov
g
it-gui: R
e
i
m
plement and enhanc
e
auto-sel
e
ction of
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-05
A
lexander Gavr
i
lov
g
it
-
gui:
Support
c
o
nflict states _U & UT
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-05
Alexande
r
G
a
vrilov
gi
t
-gui:
S
u
pport more
m
erg
e
t
ools
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-09-05
A
lexander Gavrilov
git-
g
ui: D
o
n
'
t allow sta
g
ing fi
l
es with c
o
nflicts
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
next