repo.or.cz
/
git
/
debian.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git-gui: run post-checkout hook after clone
2009-04-08
Jens Lehmann
gi
t
-gui: run
p
ost-ch
e
ckout hook after clone
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2009-04-08
S
hawn O
.
Pea
r
ce
Merge
branch 'main
t
'
commit
|
commitdiff
|
tree
2009-04-08
Ferry Huberts
git-gui:
E
n
su
r
e
c
onsis
t
e
n
t usage of mer
g
etool
.
keepBack
u
p
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2009-04-08
J
o
e
rg Bornemann
git-gui: fix use of und
e
clare
d
variable dif
f
_empty_count
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2009-04-05
Markus
H
e
idelberg
git-gui (Win
)
:
m
a
ke starting
v
ia "Git
GUI
H
e
r
e
" o
n
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2009-04-05
M
a
rkus Heidelberg
gi
t
-gui (Win): mak
e
"Explore Wor
k
ing C
o
py" more r
o
bust
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2009-04-05
Jen
s
Lehmann
git-
g
ui: ru
n
post-checkout hook on checko
u
t
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2009-04-05
Je
n
s Leh
m
an
n
git-gui: When calling post-
c
ommit hook
w
ron
g
variable
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2009-04-05
Mark
u
s Heidelberg
git-g
u
i:
u
s
e
`
g
i
t --html-pa
t
h` to g
e
t the
l
o
c
ati
o
n
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2009-03-30
S
ha
w
n O
.
Pearce
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2009-03-30
M
a
rkus
Heidelberg
git-gui: fix
d
eleting from the
c
ontext menu with em
p
ty
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2009-03-24
Sam H
o
ce
v
ar
g
i
t-gui: minor sp
e
lling
f
ix and string fac
t
orisation
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2009-03-24
S
am
H
ocev
a
r
git-
g
u
i: var
i
ous Fr
e
nch transla
t
i
o
n
fix
e
s
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2009-03-20
Shawn O
.
Pearce
M
er
g
e
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2009-03-20
Jens Lehmann
git-gui: F
i
x merge c
o
n
f
lict display erro
r
whe
n
f
ilename
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2009-03-17
S
hawn O
.
Pearce
Merge branch 'maint'
commit
|
commitdiff
|
tree
2009-03-17
Mark
u
s Heidelb
e
rg
git
-
gui: don
'
t hid
e
the Brow
s
e but
t
o
n
when resiz
i
n
g
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2009-03-09
Phil L
a
wrenc
e
A
ppend ampersand to
"
Targe
t
" of
lnk files created by
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2009-02-08
Ale
x
ander Gavril
o
v
g
i
t
-
gui: Supp
o
rt more gi
t
ver
s
io
n
notations
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2009-02-08
Alexand
e
r Gavrilo
v
git-gui: A
v
o
i
d a
n
infinite rescan loop in ha
n
dle_empty_diff
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2009-02-01
Alexan
d
er Gavrilov
git
-
gu
i
: Fix post-commit status
w
i
t
h subject in non
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-12-18
Shaw
n
O
.
P
e
ar
c
e
gi
t
-gui 0
.
12
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-12-17
Johannes Schinde
l
in
git-gu
i
:
Get rid of the last re
m
n
a
nts of
GIT_CONFIG_LOCAL
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-12-10
Mikl
o
s Va
j
n
a
git-
g
ui: Upd
a
te Hungari
a
n translation
f
or 0
.
12
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-12-10
Peter Krefting
git-gu
i
: Fi
x
ed
ty
p
o
s
in
S
w
e
d
i
sh tran
s
lation
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-12-09
Peter Kr
e
ftin
g
g
it-
g
u
i
: Upd
a
te
d
Swedish translation (515t0f0u)
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-12-09
Michele Ballabio
git
g
ui: update Italian t
r
anslation
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-12-09
N
a
nako Shiraishi
g
i
t-gui: Upda
t
e Japanese transla
t
ion for 0
.
1
2
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-12-08
Fred
r
ik
S
kolmli
git-gui: Starti
n
g translation for Norwe
g
ian
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-12-08
Christi
a
n Stimming
g
it
-
gui: Upd
a
te German (
c
ompleted) transla
t
ion
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-12-08
S
h
a
w
n O
.
Pearce
git-gui: U
p
date po template to incl
u
d
e
'Mirroring
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-12-08
Alexander Gav
r
i
l
ov
git-gui: Fix co
m
mit encoding
handling
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-12-08
A
l
e
xande
r
Gavrilov
git-
g
ui: Fix handlin
g
of re
l
ative paths in
blame
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-12-02
Ma
r
k
Burton
git-
g
ui
:
Teach start_push_anywhere_action{} to not
i
c
e
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-11-26
Nanako Shiraishi
git-g
u
i:
upd
a
te Ja
p
anese tr
a
nsl
a
ti
o
n
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-11-23
Christian
C
o
u
d
er
g
i
t-gui: french translation update
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-11-21
Peter Krefting
Updated Swedish translation (514t0f0u)
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-11-19
Miche
l
e
Ballabio
git gui: u
p
date
I
talian transl
a
tion
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-11-18
Miklo
s
Vajna
Update
Hungarian transla
t
ion
.
1
00%
completed
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-11-16
A
l
exander Gavrilov
git-gui: Fix the
s
earch
b
a
r
destr
u
ction
h
andler
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-11-16
Shawn O
.
Pea
r
ce
Upd
a
t
e
t
h
e
p
o te
m
plate
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-11-16
Al
e
xander Gavrilov
g
it-gui: Im
p
lem
e
nt autom
a
ti
c
rescan after Tool execution
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-11-16
Alexander Gavril
o
v
git-gu
i
: A
l
low Tools requ
e
st arguments from th
e
user
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-11-16
Alexande
r
Gavrilov
git
-
gui: Add
a Tools menu
f
or arbitrary co
m
mands
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-11-16
Alexander Gavrilov
git-gui: Fix the after callbac
k
executi
o
n
i
n rescan
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-11-16
A
l
exander Gavrilov
git-gui:
I
mplement system-wide configuration handling
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-11-16
G
i
us
e
ppe Bil
o
tta
g
i
t-
g
ui: try to provide
a
w
indo
w
ic
o
n under X
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-11-11
Ale
x
an
d
e
r Gavrilov
git-gui: Request
blame metada
t
a in utf-8
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-11-11
Alexander Gavrilo
v
g
it-gui: Add the S
h
o
w SSH Key i
t
e
m to th
e
cl
o
n
e
d
i
a
log
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-11-11
Alex
a
n
der Gavrilov
git-gui: F
i
x focus tr
a
nsition in the blame
v
iewer
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-11-02
Christian Sti
m
m
ing
git-gui
:
Update
G
e
rman
transla
t
ion
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-11-01
Johannes Sixt
git-gui: Do
not m
u
nge
con
f
l
ict marke
r
lines in a
n
ormal
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-11-01
Alexander
G
avr
i
l
o
v
g
it-gui: Add a simple implemen
t
a
t
i
o
n of SSH_A
S
KPASS
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-11-01
Alexander G
a
vrilov
git-gui:
A
dd a dialog that shows
the OpenSSH publ
i
c
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-10-10
Johannes Sixt
git-gui: Mark-up s
t
ring
s
in show_{other,unmer
g
ed}_d
i
ff
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-10-10
Johannes Sixt
git-gui: Show
a round number of bytes of large u
n
tracked
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-10-10
Al
e
x
a
nd
e
r
G
a
vrilov
git-gui: Fix the blame v
i
ewer dest
r
oy handl
e
r
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-10-10
Alexander Gav
r
ilov
git-g
u
i: Add a se
a
rch
command to the blame viewer
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-10-10
A
l
e
xander Gavrilov
gi
t
-gui: Fix
th
e
blame window shape
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-10-10
Johannes Sixt
g
i
t-g
u
i: Fix switch
statement in lib/merge
.
tcl
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-30
Petr Baudis
git-gui
:
F
ix f
e
tching from
re
m
otes
w
he
n
adding
t
hem
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-30
Petr B
a
udi
s
g
it-gui:
Fix removing
non-pushable r
e
m
o
tes
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-30
Petr
Baudis
g
it-gui: Make input
boxes in init/clo
n
e/open dialogs
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-30
Petr Baudis
g
it-gui: Avo
i
d using the t
e
rm U
R
L when specifying r
e
p
o
si
t
ories
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-30
Petr Baudis
git
-
gui: gui
.
au
t
oex
p
l
ore makes ex
p
lorer to pop up
a
utomatica
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-30
Petr Baudis
git-gui: Add
E
xp
l
ore Working Copy to the Repository
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-30
P
etr Baudis
g
it-gui: U
s
e git web
-
-browse
r
fo
r
we
b
browsing
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-30
Petr Baud
i
s
git-gui: m
k
dir -p w
h
en initia
l
izing new r
e
mote repos
i
tory
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-30
Petr Baudis
git-gui: Add
support
for re
m
oving r
e
motes
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-30
Pe
t
r Baud
i
s
git-gu
i
:
Add
s
upport for
a
d
din
g
r
e
motes
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-30
Pe
t
r Baudis
git
-
gui: Squas
h
populate_{push,fetch}
_
menu
to p
o
pulate_
r
emot
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-30
P
e
t
r Baudi
s
git-gui:
C
larify the Remote -> De
l
ete
.
.
.
action
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-30
J
ohan
n
es Sixt
git
-
g
u
i: Re
m
ove s
p
ace f
r
om
the end of aspell's
r
ep
l
y
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-30
Al
e
xander Gavrilo
v
g
i
t-gui: Make Ctrl-
T
safe
to
u
s
e for con
f
li
c
ting files
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-30
Johannes Sixt
git-g
u
i: Do n
o
t a
u
tomatical
l
y st
a
ge file a
f
ter merge
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-26
S
hawn
O
.
Pe
a
r
ce
git-
g
ui: Show/hide "Sign Off" based
on no
c
o
m
mi
t
msg
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-26
Sh
a
wn O
.
Pearce
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-09-26
Gustaf Hendeby
git-gui: Help identify aspell vers
i
on on
Windows too
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-24
Alexan
d
er
Gavril
o
v
git-gui: Reenable staging u
n
m
e
rged files by clicking
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-24
Alexander
G
avrilov
git-gui: S
u
p
por
t
th
e
e
ncodi
n
g me
n
u
in
g
ui
bla
m
e
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-24
Alexa
n
der
G
av
r
ilov
git-gu
i
: O
p
timize encod
i
n
g
name r
e
soluti
o
n
using a
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-24
Alexander
G
a
v
r
ilov
git-gu
i
: Al
l
ow forcin
g
d
i
splay
e
ncoding for diffs
using
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-24
Alexander G
a
vril
o
v
git-gui: Add a
m
enu of ava
i
l
a
ble en
c
odi
n
g
s
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-24
Alexander Gavrilov
git-gu
i
:
Cleanup handling
of the def
a
ult
e
n
coding
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-24
Shawn O
.
Pearce
git-
g
ui
:
Assume `blame
--i
n
crementa
l
` outp
u
t is
i
n
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-24
S
hawn O
.
Pearce
git-gui:
U
se gitattribute "encoding" for file
content
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-24
Josh
u
a Williams
git-gu
i
: Add suppor
t
for c
a
ll
i
ng ou
t
to the prepare
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-24
Shawn O
.
Pearce
git-gui: Hide commit related UI durin
g
c
i
to
o
l
--nocommit
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-24
A
lexand
e
r
Gavrilov
git-gu
i
: Add more int
e
grat
i
on option
s
to citool
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-13
Ch
r
istian Stimming
g
it-g
u
i
:
Updated G
e
rman
t
r
a
n
slation
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-05
S
haw
n
O
.
Pe
a
rce
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-09-05
Shawn O
.
Pearce
gi
t
-g
u
i: Fix diff parsing for lines starti
n
g
with
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-05
Alex
a
nder Gavrilov
git
-
gui: Show special diffs for complex conflict ca
s
es
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-05
Al
e
xander Gavrilov
g
it-gui:
Ma
k
e F5 rese
l
ect a diff, i
f
an untr
a
cked f
i
le
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-05
Al
e
xand
e
r Gavr
i
l
o
v
git-g
u
i:
Reimplement and enhance auto-sele
c
ti
o
n of
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-05
Al
e
xand
e
r Gavr
i
l
o
v
git-gui: Support
con
f
lict state
s
_U &
UT
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-05
Alexander Gav
r
ilo
v
git-gui: S
u
pport
more merge tools
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-05
Ale
x
a
n
der Gavrilov
git-gui: D
o
n't allow stag
i
n
g
f
i
les
with conflicts
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-05
Alexander
G
avrilov
git-gui: Support calling
m
erge tool
s
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-09-05
Alexande
r
G
av
r
ilov
g
it-gui:
S
uppo
r
t resolvi
n
g conflicts via the diff conte
x
t
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
next