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
git gui 0.7.0
2007-05-10
S
h
aw
n
O
.
Pear
c
e
gi
t
g
ui 0
.
7
.
0
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-05-10
Shawn O
.
Pe
a
rc
e
git-gui: Pa
p
er
b
a
g
fix
b
lame in
s
ubdir
e
ctory
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-05-09
Sh
a
wn O
.
Pearce
g
it-
g
ui: Format autho
r
/committer times i
n
ISO format
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-05-09
Sh
a
wn O
.
P
earce
git-gui: Cle
a
nup m
i
nor nits
in blame code
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-05-09
Shawn O
.
Pearce
git-gui:
G
enerate bla
m
e on u
n
committed working
tree
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-05-09
Shawn O
.
Pear
c
e
g
it-gui: Smarter com
m
a
n
d line
pa
r
sing for br
o
ws
e
r,
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-05-09
Shawn O
.
Pearce
git-
g
ui: U
s
e prefix
i
f blame
i
s
run in a sub
d
ire
c
tory
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-05-09
Shawn O
.
Pearce
git
-
gui:
C
onve
r
t blame to the "class" wa
y
of doing
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-05-09
Shawn O
.
Pear
c
e
git-gui: Don't attempt
to i
n
line array reads in methods
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-05-09
Shawn
O
.
Pearce
gi
t
-
g
ui: Co
n
vert browser,
c
on
s
ole to "class" format
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-05-09
Sha
w
n O
.
Pearce
git-gui
:
Define a
simple cla
s
s/method system
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-05-09
S
haw
n
O
.
Pear
c
e
git-gui:
Allow
shif
t
-{k,
j
} to select a range o
f
br
a
nches
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-05-08
Shawn O
.
Pearce
Merg
e
b
r
anch
'maint'
commit
|
commitdiff
|
tree
2007-05-08
Sh
a
wn O
.
Pearce
g
i
t
-gui:
U
se
vi
-
like ke
y
s
i
n merge dialog
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-05-08
Shaw
n
O
.
Pearce
git-gui:
I
nclude commit i
d
/
s
ubject in merge choices
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-05-08
Shawn O
.
P
e
a
rc
e
git-gui: Show all poss
i
b
le branches f
o
r merge
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-05-08
Shawn O
.
Pe
a
rce
git
-
gu
i
: Move me
r
g
e
su
p
port int
o
a
namespace
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-05-08
Shawn O
.
Pear
c
e
gi
t
-gui: Allow vi
k
eys to scroll the diff/blame regions
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-05-08
Shawn O
.
Pearce
git-gui: Move co
n
s
ole p
r
o
cs into their own namespace
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-05-08
Shawn O
.
Pearce
git-gui: Refactor into multiple files to save my sa
n
i
t
y
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-05-02
Shawn O
.
Pe
a
rc
e
git-
g
ui: Track
o
u
r
own embedded values and r
e
build
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-05-02
S
hawn O
.
Pea
r
ce
git-g
u
i:
R
efact
o
r to use o
u
r git proc
more often
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-05-02
Shawn O
.
P
e
a
r
ce
g
i
t
-gui: Use option d
a
t
abase defaults to set the font
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-05-02
Sh
a
w
n
O
.
P
e
ar
c
e
git
-
gui:
Cleanup common font h
a
ndling
for
f
ont_ui
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-05-02
Shawn
O
.
Pearce
gi
t
-g
u
i:
C
o
rrect line
w
rapping for too many branch
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-05-02
Shaw
n
O
.
Pearce
gi
t
-gui: Warn users
bef
o
re making an octo
p
us merge
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-05-02
Shawn O
.
P
e
arc
e
g
i
t-gui: Include the subject in the status bar
after
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-05-02
Shawn O
.
Pearce
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2007-05-02
Shawn O
.
P
earce
git-gui: Allow s
p
ace
s
in path to 'wish'
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-04-24
Shawn O
.
Pearce
g
i
t-gui: Correctly handl
e
UTF-8 encode
d
commit m
e
ssa
g
es
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-04-17
S
hawn O
.
Pearce
R
e
vert "A
l
l
ow wish i
n
terpreter to be defined with T
C
LTK_PATH"
commit
|
commitdiff
|
tree
2007-04-15
Shawn O
.
Pear
c
e
gi
t
-gu
i
: Dis
p
lay
t
he dire
c
t
o
ry b
a
sename in the
title
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-04-15
Sha
w
n O
.
P
earce
Merge branch 'er/ui'
commit
|
commitdiff
|
tree
2007-04-04
Shawn O
.
Pe
a
rce
git-gu
i
:
B
ro
w
n
paper bag fix d
i
vision by 0 in b
l
ame
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-04-04
S
h
awn O
.
P
ear
c
e
Al
w
ays bind the ret
u
rn ke
y
to t
h
e defa
u
lt button
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-03-12
Shawn O
.
Pea
r
c
e
M
e
rge
b
ranch 'main
t
'
commit
|
commitdiff
|
tree
2007-03-12
Sh
a
wn
O
.
P
e
arce
gi
t
-gui:
All
o
w
'
git
g
ui v
e
rsio
n
' o
u
tsi
d
e of a repository
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-03-12
Shawn O
.
Pearce
git-gui
:
Revert "git-gui
:
Di
s
p
l
ay a
l
l aut
h
o
r
s of gi
t
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-03-12
Shawn O
.
Pearce
git-gu
i
:
Revert
"Don't modify
C
RED
I
T
S-F
I
LE if it hasn
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-03-12
Shawn
O
.
Pearce
git
-
g
u
i:
Allow committi
n
g empty merges
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-03-06
Sha
w
n O
.
Pearce
git-gui: Make '
m
ake' qu
i
e
t
er by defa
u
lt
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-03-01
Sha
w
n O
.
Pearce
g
i
t-gui: Re
m
ove u
n
ne
c
essary /
d
ev/null redirection
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-26
Shawn
O
.
P
e
a
r
ce
git-gui: Don't create
e
mpt
y
(s
a
me tree as par
e
n
t) commi
t
s
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-26
S
h
awn O
.
Pearce
git-gui
:
A
d
d Reset to the Branch
m
enu
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-26
Shawn O
.
Pearce
git-gu
i
: Rel
o
cat
e
th
e
menu/transport menu code
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-21
Sh
a
w
n
O
.
Pear
c
e
git-gu
i
: Don't c
r
a
sh in citool mode
o
n initial c
o
mmit
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-21
S
hawn O
.
Pearce
g
it-
g
u
i
:
R
e
m
o
v
e
TOD
O
lis
t
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-21
Shawn
O
.
P
e
a
r
ce
git-gui: Include
browser i
n
our usa
g
e message
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-21
Sh
a
w
n O
.
Pearce
git-gu
i
:
C
h
ange su
m
mary of git-
g
ui
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-21
Shawn
O
.
P
earce
git
-
gui: Disp
l
ay all aut
h
ors of git-gu
i
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-21
Shawn O
.
P
e
arce
gi
t
-gui
:
Use mixed
p
a
th for docs on Cy
g
win
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-18
Shawn O
.
Pearce
git
-
gui: Correct crash wh
e
n saving options
i
n blame
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-16
Shawn O
.
Pea
r
ce
git
-
gui: Expo
s
e the browse
r
as a sub
c
o
m
mand
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-14
Shawn
O
.
Pear
c
e
git-gui:
P
r
efer
ve
r
sion
f
ile
over git-
d
esc
r
ibe
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-14
Shawn O
.
P
earce
git-g
u
i: Print
version on t
h
e c
o
nsole
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-14
Shawn
O
.
Pearce
git-gu
i
: More c
o
nsistently disp
l
ay the a
p
plication
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-14
Shawn O
.
P
e
arc
e
git-gui: Permit m
e
r
g
ing
t
ags i
n
t
o
th
e
c
ur
r
en
t
bra
n
ch
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-14
Shawn
O
.
Pear
c
e
git-
g
ui: Basi
c
version check to ensur
e
git 1
.
5
.
0 or
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-14
Sh
a
wn O
.
P
e
ar
c
e
git-gui: Refact
o
r 'ex
e
c
g
it su
b
cm
d
' idiom
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-12
Shawn
O
.
Pearc
e
git-
g
ui: Change bas
e
version t
o
0
.
6
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-12
S
h
a
wn O
.
Pea
r
ce
git-gui: G
u
ess our versi
o
n accurately as
a subproject
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-12
S
h
a
wn
O
.
P
e
arc
e
git-g
u
i:
Handle gitgu
i
tags in version g
e
n
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-12
Shawn O
.
Pearc
e
git-gui: Generat
e
a
v
ersion
f
i
le on demand
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-12
Shaw
n
O
.
Pearc
e
g
i
t-gu
i
:
Ren
a
m
e
G
IT
_
VERSION t
o
GIT
G
UI_VER
S
I
ON
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-12
Shawn O
.
Pea
r
ce
git-gui: Al
l
ow
g
itex
e
cdir, INSTALL
to b
e
s
e
t by t
h
e
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-11
Shawn O
.
Pearce
git-
g
ui: St
o
p
d
eleting gitk preferences
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-09
Sh
a
wn
O
.
Pearce
git-gui: Fo
c
u
s into
b
lame
panels on
M
ac OS
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-09
Shawn O
.
Pearce
gi
t
-gui: Improve annotated f
i
le display
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-09
Shawn O
.
Pe
a
rce
git-gu
i
: Jump to the
f
irst annota
t
ion block as soon
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-09
Shaw
n
O
.
Pearce
git-gui:
Redesig
n
the display of annotate
d
files
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-09
Sha
w
n O
.
Pearce
g
it-gui: Use gi
t
-
c
onfig
now
o
ver git-repo-config
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-09
Sh
a
wn O
.
Pearce
git-gui: Relabel the
A
dd All action
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-09
S
h
a
w
n O
.
P
earce
git-
g
ui:
Sele
c
t subcommands
like gi
t
doe
s
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-09
Sh
a
wn O
.
Pearce
git-gu
i
: View blame from the command lin
e
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-08
Shawn O
.
Pearce
g
i
t-gui: Optionally save commit buffe
r
on exit
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-08
Shawn O
.
Pea
r
ce
git-gui
:
Se
p
arate transport/branch menus from mult
i
c
o
mmit
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-08
Shawn O
.
Pearce
gi
t
-gui: Ref
a
ctor single_c
o
mmit to a proc
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-08
Shawn O
.
Pearce
g
it-gui
:
Replace \ wit
h
\\ when
s
h
o
w
i
ng paths
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-08
Shawn
O
.
Pearce
git-gui
:
Sup
p
ort ke
y
board
tra
v
er
s
al
in bro
w
ser
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-02-08
Shawn O
.
Pea
r
ce
g
i
t-gui: Update know
n
branches during rescan
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-29
Shaw
n
O
.
Pear
c
e
g
it-gui: Assi
g
n
backgro
u
nd colo
r
s
to each blame
hunk
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-29
Shawn O
.
Pearce
git
-
gui: Use a g
r
id
l
ayout fo
r
the blame viewer
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-29
S
h
awn O
.
P
earce
git-gui:
Install
column headers in
b
lame v
i
ewer
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-29
Shawn
O
.
P
e
a
rce
git-g
u
i: Displa
y
original filena
m
e and line number
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-29
Shaw
n
O
.
P
earce
git-gu
i
: Cor
r
ectly ha
n
dle
spaces in filepaths
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-29
Shawn O
.
P
e
a
rce
git-g
u
i: Use -M and -C wh
e
n running
blame
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-29
Shawn
O
.
Pearc
e
git-gui:
Allow
users to edit user
.
n
ame
,
user
.
emai
l
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-29
S
hawn O
.
Pearce
gi
t
-gui: Displa
y
the current branch n
a
m
e in brow
s
ers
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-29
Shawn O
.
Pearce
git-
g
ui: Improve the ico
n
s use
d
i
n
the
browse
r
display
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-29
Sha
w
n
O
.
P
earce
git-g
u
i: Implemented file browser an
d
incremental blame
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-29
Shawn O
.
Pearce
git-gui:
Test
for Cygwin differe
n
tly than fro
m
W
indo
w
s
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-29
Shawn O
.
Pe
a
rce
gi
t
-
g
ui:
O
ffer
q
uick access to the HTML for
m
a
tted docu
m
en
t
ation
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-27
Shaw
n
O
.
Pearce
git-gui: Reword
m
eaning
o
f
merge
.
summary
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-26
Shawn O
.
Pearce
git-gui
:
S
upport merg
e
.
summary, merge
.
v
e
rbosity
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-26
Shaw
n
O
.
P
earce
git-gui: Always
o
f
f
er sc
r
ollbars fo
r
branch li
s
ts
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-26
Sha
w
n O
.
Pearce
git
-
gui: Don't allow merges in the
middle of other
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-26
Shawn O
.
Pea
r
c
e
git
-
gu
i
:
D
o
n't allow users to commit a bad o
c
topus
.
.
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-26
Shawn O
.
Pearce
git-gui: Update status
b
a
r
dur
i
ng a
merge
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-26
Sha
w
n O
.
Pearce
git-gui: Let users abort
w
ith `rese
t
-
-hard` type logic
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
2007-01-26
Sh
a
w
n
O
.
Pearce
git-gui: Im
p
lement local merge
operation
s
.
Signed-off-by:
Shawn O. Pearce
<spearce@spearce.org>
commit
|
commitdiff
|
tree
next