repo.or.cz
/
git-gui
/
me-and.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
Shaw
n
O
.
Pearce
git-gui: H
o
nor th
e
stand
a
r
d
commit-m
s
g ho
o
k
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-01-16
Shawn O
.
Pearce
git-gu
i
: Refresh file
status description after hunk
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2008-01-16
Shawn O
.
Pearce
g
it-gui: A
l
lo
w
'Create
New
Repository' on exis
t
ing
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-12-14
Shawn
O
.
Pearce
g
i
t-g
u
i
: Handle file mode changes (644->755) in diff
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-11-21
Shawn O
.
Pearce
git-gui 0
.
9
.
0
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-11-08
S
h
awn O
.
Pearce
git-gui: B
i
nd
Meta-T f
o
r "Stage To Commit"
menu action
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-11-01
S
h
awn O
.
Pe
a
r
c
e
git-gui: Allow users to set fo
n
t weights to bold
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-26
Shawn
O
.
P
earce
gi
t
-
g
ui: Protect
a
g
a
i
nst bad translation string
s
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-23
Sha
w
n O
.
P
earce
Merge
b
r
a
n
ch 'mai
n
t'
commit
|
commitdiff
|
tree
2007-10-23
S
h
awn O
.
Pearce
git-gui
:
Make sure we get e
r
rors
from g
i
t-
u
pdate-index
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-21
Sh
a
wn O
.
P
earce
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-10-21
Shawn O
.
Pearce
git-gui
:
Don't display C
R
w
i
t
hin c
o
nso
l
e windows
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-21
Shawn O
.
Pearce
git
-
gui: Han
d
le prog
r
ess bars
f
ro
m
newer g
i
ts
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-20
Shawn
O
.
P
earce
git-gui:
Correctly re
p
o
rt
f
a
ilures from git
-
write-tree
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-17
Shawn O
.
P
earce
git-gui:
P
aper bag fix t
h
e global config parsing
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-14
S
h
awn O
.
Pearce
git-
g
ui:
Honor a confi
g
.
m
ak
i
n git-gui'
s
to
p
level
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-13
Shawn O
.
Pearce
git-gui: Collapse $env(HOME) to ~/ in rec
e
nt
repositorie
s
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-13
Shawn O
.
P
earc
e
g
i
t-gui: S
u
pport cloning Cygwin based work-d
i
rs
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-13
Shawn O
.
Pe
a
rce
git-gui: Use proper Win
d
ows shortcuts instead of
b
at
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-13
S
hawn O
.
Pearce
g
i
t-g
u
i: Ensure
c
opyright message
i
s correct
l
y read
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-13
Sha
w
n O
.
Pearce
g
it-gui:
Bi
n
d n/c
/
o
accelerators in repository chooser
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-13
Shawn O
.
Pearce
git-gui
:
D
i
sable the text wi
d
get in t
h
e re
p
ository
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-13
Shawn O
.
Pear
c
e
git-gu
i
: Fix bind errors when switching repository
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-12
Shawn O
.
P
earc
e
git-gui: O
f
f
e
r repository
management features in menu bar
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-12
Sh
a
wn O
.
Pearce
g
i
t-gu
i
: Change repository browser radio butto
n
s
t
o
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-12
S
h
a
wn O
.
P
earce
git-gui: Supp
o
rt LFs embedd
e
d
i
n
c
o
nf
i
g f
i
le v
a
l
u
e
s
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-12
Shawn O
.
Pearce
gi
t
-gui: Re
f
a
ctor
g
it-config --li
s
t parsing
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-12
Shawn
O
.
Pearce
git-gui:
M
o
ve load_co
n
fig procedur
e
be
l
ow git-v
e
rsion
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-10
Sha
w
n
O
.
Pearce
git-gu
i
: Update
d
po
s
t
r
in
g
s based on curre
n
t sour
c
es
commit
|
commitdiff
|
tree
2007-10-10
Shawn O
.
Pe
a
rce
Merge br
a
nch 'cs/de'
commit
|
commitdiff
|
tree
2007-10-10
Shawn O
.
Pea
r
ce
git-g
u
i: Shorten t
h
e s
t
aged/unst
a
ge
d
changes title
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-10
Shawn O
.
P
e
arce
git-gui: Bind
C
md-, to
P
references
on Mac
O
S X
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-10
Sha
w
n
O
.
Pearce
git-gui
:
Con
s
olidate the F
e
t
ch and Push menu
s
in
t
o
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-10
Shawn
O
.
Pea
r
ce
git-gui: Use progress meter in t
h
e stat
u
s ba
r
d
u
ri
n
g
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-10
Sh
a
wn O
.
Pearce
g
i
t-
g
ui:
Include
o
ur G
i
t logo in the about dialog
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-10
S
hawn O
.
Pearce
git
-
gui:
Ref
a
ctor about dialog code into its ow
n
module
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-10
S
hawn O
.
Pearce
git-
g
ui: Refa
c
tor Henrik Nyh's logo into
it
s
ow
n
pr
o
c
e
dure
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-10
Shawn O
.
Pearce
Merge branch 'm
a
i
n
t
'
commit
|
commitdiff
|
tree
2007-10-03
Sha
w
n O
.
Pearce
g
it-g
u
i: All
o
w forced
p
ush into r
e
mote repository
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-03
Shawn O
.
P
e
a
r
ce
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-10-03
S
h
a
wn
O
.
Pe
a
rce
git-gui: Don't c
r
as
h
wh
e
n star
t
in
g
gitk from
a br
o
wser
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-10-03
Shawn O
.
Pearc
e
git-gui: Allow g
i
tk to be started on Cyg
w
in with nati
v
e
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-28
S
hawn O
.
Pe
a
r
ce
git-gui: Ref
e
r to ou
r
selves as
"
Git Gui" and not "git
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-28
S
h
awn O
.
P
earce
git-gui: Support a native Mac OS
X
applicatio
n
bun
d
le
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-28
Shawn O
.
Pearce
g
i
t-gui: U
s
e He
n
rik Ny
h
's
g
it logo icon on Windows
.
.
.
commit
|
commitdiff
|
tree
2007-09-26
Shawn
O
.
Pea
r
ce
g
i
t-gui: Make the s
t
atus bar
e
asier t
o
rea
d
in th
e
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-26
Shaw
n
O
.
Pearce
gi
t
-gui: Sw
i
tch the git-gui logo to Henr
i
k
N
yh's logo
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-26
Shawn O
.
Pearc
e
git-gu
i
: Don't dele
t
e scrollbars in consol
e
windows
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-26
Shawn O
.
Pearce
g
i
t-gui
:
Don't d
e
le
t
e
console win
d
ow namespaces too
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-25
Sh
a
wn O
.
P
e
arce
g
it-gui: Copy objec
t
s/in
f
o/alternates duri
n
g standard
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-25
Shaw
n
O
.
Pe
a
rce
git-gui
:
Keep the UI responsive
while count
i
ng objects
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-25
S
hawn O
.
Pearce
git-gui
:
Don't bother showing OS
error me
s
sa
g
e about
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-23
S
ha
w
n O
.
P
earc
e
git-g
u
i:
A
void console s
c
rollbars unless
t
hey
a
re n
e
cessary
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-23
Shawn O
.
Pea
r
c
e
git
-
gu
i
: Allow users to c
h
oose/create/cl
o
ne a
r
epository
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-22
S
hawn O
.
Pe
a
rce
git-gui
:
Re
f
actor
s
ome UI init to occur earlier
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-22
Shawn O
.
Pe
a
rce
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2007-09-22
Shawn O
.
P
earce
git-gui: E
n
sure
.
git/
i
n
fo/exclude
is hono
r
ed in Cy
g
win
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-22
Shawn
O
.
Pearc
e
g
i
t-
g
u
i
:
H
a
n
dle starting
on mapp
e
d s
h
ares u
n
der Cygwin
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-22
Shawn
O
.
Pear
c
e
g
i
t-
g
ui
:
Display m
e
ssage bo
x
when
w
e can
n
ot
f
ind
git
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-21
Shawn O
.
Pearc
e
git-g
u
i: Support native Win32 Tcl/Tk under Cygwin
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-20
S
hawn O
.
P
e
arce
g
i
t-gui:
F
ix miss
i
ng i18n
m
a
rkup in push/
f
etch wi
n
dows
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-20
Shawn O
.
Pearc
e
Merge branc
h
'
maint'
commit
|
commitdiff
|
tree
2007-09-17
Shawn O
.
Pearce
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2007-09-17
Shawn O
.
Pearce
git-gui: Di
s
able native
platform text
selecti
o
n in
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-14
S
h
a
wn O
.
P
e
a
rce
g
it
-
g
ui: Paper bag
f
ix
m
i
s
sin
g
t
rans
l
ated strin
g
s
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-14
Shawn
O
.
Pearce
git-gui:
M
ake the tree b
r
o
w
ser als
o
use
l
ightgra
y
selection
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-14
Shawn O
.
Pearce
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-09-14
Sh
a
wn O
.
Pe
a
r
c
e
g
i
t-gui: P
a
per bag fix "
C
o
mmit->Re
v
e
r
t" format argu
m
ents
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-14
Shawn O
.
Pearce
git-gu
i
: Provide
'
uni
n
stall' Makefile tar
g
et to undo
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-13
Shawn O
.
P
e
arce
Me
r
g
e
branch 'maint'
commit
|
commitdiff
|
tree
2007-09-13
Shawn O
.
Pearce
g
i
t
-gui
:
Font chooser
to h
a
ndle a
l
arge number
of font
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-13
Shaw
n
O
.
Pea
r
ce
git-gui: Make backpo
r
t
i
n
g
chan
g
e
s
fr
o
m i18n versi
o
n
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-12
S
hawn O
.
Pearce
git-gu
i
:
Document
the new i18n
c
ontext suppor
t
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-12
Shawn O
.
Pea
r
ce
gi
t
-gui: Support context-sensitive i18n
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-11
Shawn O
.
Pea
r
ce
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2007-09-11
Shawn O
.
P
e
a
r
c
e
git-gui
:
Do
n
't delete send on Windows
as i
t
doesn'
t
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-10
Shawn O
.
P
e
arce
git-gui: Loca
l
i
z
e co
m
mit/author dates when
displ
a
yin
g
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-10
Shawn O
.
Pea
r
ce
git-gui: Mark
re
v
ision cho
o
s
e
r
tooltip for translation
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-10
S
hawn O
.
Pearce
Merge
b
ra
n
ch '
m
aint'
commit
|
commitdiff
|
tree
2007-09-10
Shawn O
.
P
earce
g
i
t-gui
:
T
rim trailing s
l
ashes from u
n
t
r
acked subm
o
d
ule
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-10
Sh
a
wn
O
.
P
earce
git-gui: Ass
u
me untracked director
i
e
s
are
G
i
t submod
u
les
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-09
Shawn O
.
Pe
a
r
c
e
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-09-09
Shawn O
.
Pea
r
ce
git-gui: Avoid use of l
i
bdir
i
n Mak
e
file
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-09
Shawn O
.
P
e
arce
g
it-g
u
i: Disa
b
le Tk s
e
nd in all gi
t
-gui sessions
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-04
Sha
w
n
O
.
P
e
ar
c
e
Merge branch 'maint'
commit
|
commitdiff
|
tree
2007-09-04
Shawn O
.
Pearce
git-gui: E
n
s
u
re
msgfmt failure
s
to
p
s GN
U
make
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-04
Shawn O
.
Pearc
e
git-
g
u
i: Pro
p
erly
s
et the state
of
"
Stage/Unstage Hunk
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-04
Sh
a
wn O
.
Pearce
git-gui: Fi
x
detaching current branch duri
n
g
checko
u
t
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-04
Shawn O
.
Pe
a
rce
git
-
gui
:
Correct startin
g
o
f
git-remote to handle
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-03
Sha
w
n O
.
Pearce
git-gui: Q
u
i
et
the ms
g
fmt part of th
e
ma
k
e proc
e
s
s
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-03
Sh
a
wn O
.
P
ear
c
e
git-gu
i
: Corre
c
t stock
m
essage for
'
Invalid
fon
t
specif
i
ed
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-03
Shaw
n
O
.
Pearce
git-
g
ui: Up
d
a
te po/README as symlink pr
o
ces
s
is not
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-02
Shawn O
.
Pear
c
e
g
i
t-
g
ui: In
i
ti
a
lize Tcl's msgcat library for in
t
ernationa
l
iz
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-09-02
Shawn O
.
P
e
arce
git-gui: L
o
cat
e
th
e
library d
i
r
ectory early durin
g
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-08-25
Sha
w
n
O
.
Pearce
g
i
t-gui: Corre
c
t
'
git gu
i
blame
'
i
n a subdirectory
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-08-23
Sh
a
w
n
O
.
Pearc
e
g
i
t-gui
:
D
o
no
t
offer to s
t
age
t
hree-way
diff h
u
nks
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-08-23
Shawn O
.
Pearce
git-gui
:
Refactor diff pan
e
popup
s
upport for
f
ut
u
re
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-08-22
S
haw
n
O
.
Pear
c
e
git-gu
i
: Fix "
u
nop
t
imi
z
ed l
o
ading"
t
o
not cause git
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-08-21
S
h
awn O
.
Pearce
git-gui
:
Pape
r
b
a
g fix "Stage Hunk For Comm
i
t"
i
n diff
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
2007-08-20
S
hawn O
.
Pea
r
ce
git-gui
:
A
l
low git
-
merge to use branch n
a
me
s
in conf
l
i
c
t
.
.
.
Signed-off-by: Shawn O. Pearce <
spearce@spearce.org
>
commit
|
commitdiff
|
tree
next