repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
git-gui: Honor the standard commit-msg hook
2008-01-21
Sha
w
n O
.
P
earce
g
i
t-gui: Honor the standard co
m
mit-msg ho
o
k
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-01-16
Shawn O
.
Pearce
g
i
t-
g
ui: Refresh
f
ile
s
tatu
s
des
c
r
iption after hunk
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2008-01-16
S
h
awn O
.
Pearce
git-gu
i
:
Allow 'Create New Repos
i
to
r
y'
on existing
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-12-14
Shawn
O
.
Pearce
git
-
g
ui: Handle fil
e
mode changes (644->755) in
d
i
f
f
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-11-21
Shawn O
.
Pearce
g
i
t
-gui
0
.
9
.
0
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-11-08
Shawn O
.
Pe
a
rce
git-gui: Bind Meta-T f
o
r "Sta
g
e To Co
m
mit" menu
a
ction
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-11-01
S
hawn O
.
Pe
a
rce
g
i
t-g
u
i
: A
l
l
ow users to
s
et font wei
g
hts t
o
bold
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-26
Shawn O
.
Pe
a
rce
git
-
gui: Protect against
b
ad trans
l
ation stri
n
gs
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-23
Shaw
n
O
.
Pearce
Merge bra
n
ch
'
maint'
commit
|
commitdiff
|
tree
2007-10-23
Shawn O
.
Pearce
git-g
u
i: Make sure
w
e ge
t
err
o
rs from git-update
-
i
ndex
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-21
Shawn O
.
Pearce
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-10-21
Shaw
n
O
.
Pearce
g
i
t
-
g
u
i
:
Don't display CR within
c
onsole windows
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-21
Shawn
O
.
Pe
a
rce
g
it-gui: Handle p
r
ogress bars from newer gits
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-20
Shaw
n
O
.
Pearce
g
it
-
gui: Corre
c
tly report f
a
ilures
f
rom gi
t
-
write-tree
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-17
Shaw
n
O
.
Pearce
git-gui:
Paper bag fi
x
the global
c
onfig parsing
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-14
S
haw
n
O
.
Pe
a
rce
git-gui: Honor a confi
g
.
ma
k
in git-gui's top
l
e
v
el
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-13
Shaw
n
O
.
P
earce
git-gui: Co
l
lapse $env(
H
OME
)
to ~/ in recent re
p
ositor
i
es
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-13
S
h
aw
n
O
.
Pearce
git-gui: Support cloning Cy
g
win base
d
work-dirs
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-13
Shawn O
.
Pearce
git-gui
:
Use
p
roper Window
s
shortcuts instead of bat
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-13
Sha
w
n
O
.
P
e
a
r
ce
git
-
g
u
i:
E
nsure copyright message is correctly read
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-13
Sh
a
wn O
.
Pearce
g
it-gui: Bind n/c/
o
accele
r
a
tors in reposi
t
ory c
h
o
o
ser
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-13
Shawn O
.
P
earce
git
-
gui: Disable the text w
i
d
g
et in the repository
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-13
S
h
awn O
.
Pe
a
rce
git-gui: Fix bind errors when switchi
n
g repository
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-12
Shawn O
.
P
ea
r
ce
git-gui: Offer repo
s
itory managemen
t
features in menu bar
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-12
Shawn O
.
Pearce
g
it-
g
ui: Change
r
eposit
o
ry browser radio buttons to
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-12
Shawn
O
.
Pear
c
e
git-
g
ui: Support
LFs emb
e
dded in c
o
nfig file values
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-12
Shawn O
.
P
e
arce
git-gui: Refactor
g
it-config --lis
t
parsing
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-12
Shawn O
.
P
earce
g
i
t
-gui: M
o
ve load_co
n
fig pro
c
edure
b
e
low git-version
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-10
Sha
w
n O
.
P
ea
r
ce
g
it-gui: U
p
dated po str
i
n
gs based on cu
r
rent s
o
urces
commit
|
commitdiff
|
tree
2007-10-10
S
hawn O
.
Pearce
Merge
b
ra
n
ch 'cs/de'
commit
|
commitdiff
|
tree
2007-10-10
S
h
a
w
n O
.
Pearce
git-gui
:
S
h
o
rten the s
t
aged/unstage
d
c
h
a
nges ti
t
le
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-10
Shawn O
.
Pear
c
e
g
i
t-gui
:
Bind Cmd-,
t
o
Preferences
o
n
M
ac
OS
X
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-10
Shawn O
.
Pearce
g
i
t-gui: Consol
i
date the Fetch and
P
ush me
n
us into
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-10
S
h
awn O
.
Pearce
git-gui: Use progress met
e
r in the st
a
tu
s
b
a
r
during
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-10
Sh
a
wn O
.
Pearce
git-
g
ui: Include our Git
logo in the
about d
i
alo
g
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-10
Sha
w
n O
.
Pe
a
rce
g
i
t
-g
u
i:
R
e
fact
o
r
a
bout dial
o
g code into its own module
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-10
Shawn
O
.
Pearce
git-gui: Refactor Henrik Nyh's logo into its ow
n
pr
o
cedure
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-10
Shawn O
.
Pear
c
e
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2007-10-03
Shawn O
.
Pearce
g
i
t-gui: Allow for
c
ed pu
s
h
into remote rep
o
si
t
ory
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-03
S
hawn O
.
Pear
c
e
M
e
rge
branch 'main
t
'
commit
|
commitdiff
|
tree
2007-10-03
Shawn
O
.
Pearc
e
git-gui: Don't crash w
h
e
n starting gitk from a
br
o
ws
e
r
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-10-03
Shawn O
.
Pearc
e
git-
g
ui: A
l
lo
w
gitk t
o
be started on C
y
g
w
in with native
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-28
Shaw
n
O
.
Pe
a
rce
git-gui:
R
efer to ourselves as "G
i
t G
u
i
"
and not "git
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-28
Shawn O
.
Pearce
git-gui: Sup
p
ort a native Mac OS X applic
a
tion bundle
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-28
Sh
a
wn O
.
P
e
ar
c
e
gi
t
-gui: Use Henrik Nyh's git logo icon o
n
Windows
.
.
.
Signed-off-by:
Shawn O. Pearce
<shawn.o.pearce@bankofamerica...
commit
|
commitdiff
|
tree
2007-09-26
S
h
awn O
.
P
e
arce
git-gui: Mak
e
the s
t
atus bar easier to r
e
ad in the
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-26
S
hawn
O
.
Pearce
git-gu
i
: Switch
t
he git-gui logo to Henrik Nyh's log
o
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-26
S
hawn O
.
Pearce
git-gui: D
o
n't delet
e
s
c
r
ollbars
in console windows
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-26
Shawn O
.
Pearce
git-gui: Don
'
t d
e
l
e
t
e
console
windo
w
nam
e
spaces too
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-25
Shawn
O
.
Pearc
e
git-gu
i
:
C
o
py objects/info/al
t
ernates during
standard
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-25
S
ha
w
n O
.
Pea
r
ce
g
i
t
-
gu
i
:
K
eep
t
he U
I
re
s
pon
s
ive
w
hile
counting o
b
jects
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-25
Shawn
O
.
Pearce
git-gui: Don't bother showing
OS e
r
ror message about
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-23
Shaw
n
O
.
Pearce
git-gui: Avoid co
n
sole scrollbars u
n
less
they are necessary
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-23
S
h
a
w
n
O
.
Pearce
git-gui: Allow users
t
o
choose/c
r
eate/clo
n
e
a repository
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-22
S
h
awn
O
.
Pearce
git
-
g
u
i
:
R
e
fact
o
r some
U
I
ini
t
to o
c
cur ea
r
lier
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-22
Shawn O
.
Pearce
Merge bra
n
c
h 'maint'
commit
|
commitdiff
|
tree
2007-09-22
Shawn
O
.
Pe
a
rce
git
-
gui: Ensur
e
.
git/info/exclude
is hon
o
red in C
y
gw
i
n
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-22
Shawn O
.
Pea
r
c
e
git-gui
:
Handle starting on map
p
ed
s
hares u
n
d
e
r Cygwin
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-22
Shawn O
.
Pearc
e
g
i
t-gu
i
: Display
message box wh
e
n we
cannot fi
n
d
g
it
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-21
Shawn O
.
Pe
a
rce
git-gu
i
: Support na
t
ive Win32 Tc
l
/Tk under C
y
gwin
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-20
Shawn O
.
P
e
arce
git
-
gui:
Fix missing i18
n
markup in
p
ush/f
e
tch
w
i
ndows
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-20
Shawn O
.
Pear
c
e
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-09-17
Shawn O
.
Pearce
Me
r
ge branch 'maint
'
commit
|
commitdiff
|
tree
2007-09-17
Sh
a
wn O
.
Pearce
git-gui:
D
isable native
platform text selection in
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-14
S
hawn O
.
Pear
c
e
git-gui: Paper
b
ag fix missing transl
a
t
ed strings
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-14
S
hawn O
.
Pearce
git-gui
:
Make the
t
r
ee browser
a
lso use
lightgray selection
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-14
Sha
w
n
O
.
Pearc
e
Merge branch 'ma
i
nt
'
commit
|
commitdiff
|
tree
2007-09-14
Shaw
n
O
.
P
earce
g
i
t-g
u
i: Pap
e
r b
a
g fix "Com
m
it->Re
v
ert" fo
r
mat argum
e
nts
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-14
Shaw
n
O
.
P
e
a
r
ce
git-gui: Provide
'unins
t
all' Makefi
l
e
target t
o
u
n
do
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-13
Shawn O
.
Pea
r
ce
Merge bra
n
c
h
'maint'
commit
|
commitdiff
|
tree
2007-09-13
Sha
w
n O
.
Pe
a
rce
git-gui: Font chooser t
o
handle a
l
a
r
g
e number of
f
o
nt
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-13
Shawn O
.
Pear
c
e
git-gui: Make backporting
c
h
anges from
i
1
8n version
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-12
S
h
aw
n
O
.
Pearce
g
i
t-gui: Document the new i18n context supp
o
r
t
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-12
Shawn O
.
Pearce
git
-
gui: Support co
n
text-sensitive i18n
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-11
Shawn O
.
Pearce
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2007-09-11
Shawn O
.
Pearce
git-gu
i
: D
o
n't d
e
l
ete
send on Window
s
as
i
t do
e
sn't
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-10
Sha
w
n
O
.
Pearce
git
-
gui: Localize commit/author dates when
d
i
s
p
laying
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-10
S
h
awn O
.
P
earce
gi
t
-gui: Mark
r
evi
s
ion chooser tool
t
ip for translat
i
on
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-10
Shawn O
.
Pear
c
e
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2007-09-10
S
h
a
w
n O
.
Pearc
e
git-gui
:
Trim trailing slashes
f
rom untracked submodule
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-10
Shawn O
.
Pearce
git-gui: Assume
untra
c
ked directori
e
s are Git submodul
e
s
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-09
S
h
awn O
.
Pear
c
e
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-09-09
Shawn
O
.
Pear
c
e
git-gu
i
: Avoid
u
se of
l
ib
d
ir in Makefile
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-09
Shawn O
.
Pearce
git-
g
ui:
D
i
s
able
T
k send in a
l
l git-gui sess
i
o
ns
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-04
Shawn O
.
Pearce
Merge branch
'maint'
commit
|
commitdiff
|
tree
2007-09-04
Shawn O
.
Pearce
g
it-gui: Ensure msgfmt
failure stop
s
GNU mak
e
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-04
Sh
a
wn O
.
Pear
c
e
git-gui:
Properly
set t
h
e
state of "
S
t
a
ge/Uns
t
age Hunk
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-04
Sh
a
wn
O
.
Pearce
git-g
u
i
:
Fix
detaching curre
n
t br
a
nc
h
dur
i
ng c
h
ec
k
out
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-04
Shawn O
.
Pearc
e
g
i
t-gui:
Cor
r
ec
t
s
tar
t
ing of git-re
m
ot
e
to handle
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-03
Shawn O
.
Pearce
g
i
t-gui: Quiet the m
s
gfmt p
a
rt
of t
h
e make proc
e
ss
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-03
Shawn O
.
Pear
c
e
gi
t
-gui: Co
r
rect sto
c
k messag
e
for
'Invalid font speci
f
ied
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-03
Shawn O
.
Pear
c
e
git-g
u
i: Update p
o
/R
E
ADME
a
s
s
y
m
lin
k
pr
o
cess is no
t
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-02
Shawn O
.
Pearce
git-gui
:
Ini
t
ialize Tcl
'
s msg
c
at librar
y
for int
e
rnat
i
onaliz
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-09-02
Shawn O
.
Pearc
e
g
it-gui: Locat
e
the library directory early
duri
n
g
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-08-25
Sh
a
wn O
.
Pearce
g
it-gui:
C
orre
c
t 'git gui bla
m
e'
in
a
subdirec
t
o
r
y
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-08-23
Shawn O
.
Pearce
git-gu
i
: Do not off
e
r
to s
t
age
three-way di
f
f
hunks
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-08-23
Shawn O
.
P
e
arce
git-gu
i
: Refactor diff pane popup su
p
por
t
for
f
u
t
ure
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-08-22
S
h
aw
n
O
.
Pearc
e
git-gui:
Fix "un
o
ptimized load
i
ng" to not cause git
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-08-21
Sh
a
wn
O
.
Pear
c
e
git-gui:
P
aper
b
ag
f
ix
"Stage Hunk
F
or
C
o
mm
i
t"
in
d
iff
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-08-20
Sh
a
wn O
.
Pearce
git-gui: All
o
w git-m
e
rge to use bra
n
ch n
a
mes
i
n c
o
nflict
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
next