repo.or.cz
/
git
/
spearce.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'
2008-09-05
Alexander
G
a
v
r
ilov
git
-
gui: Show special diffs for comp
l
ex
conflict cases
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-09-05
A
l
exander
G
a
v
r
i
lov
g
it-gui: Make F5 res
e
lect a diff, if a
n
unt
r
acked
f
ile
.
.
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-09-05
Alexan
d
e
r
G
avril
o
v
git-gui
:
R
eimpleme
n
t and enhan
c
e
a
uto-
s
election of
.
.
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-09-05
Alexan
d
er Gavri
l
ov
git-gui: Suppor
t
confl
i
c
t
st
a
tes
_
U
& UT
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-09-05
A
l
ex
a
n
der Gavril
o
v
git-
g
ui
:
Support more merge tools
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-09-05
A
le
x
a
nder Ga
v
rilov
gi
t
-gui: Don'
t
allow stag
i
ng file
s
w
ith conflicts
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-09-05
Alexande
r
Gav
r
ilov
g
it-gui
:
Support cal
l
i
n
g
merge tools
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-09-05
Alexand
e
r Gavr
i
lo
v
git-gui:
S
upport resolving conflicts via
the dif
f
cont
e
xt
.
.
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-09-01
Alexander Gavrilo
v
git
-
g
u
i: Fix strin
g
escaping in po
2
m
s
g
.
sh
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
Alexa
n
d
e
r Gavri
l
ov
gitk: Add menu i
t
em f
o
r calling git gui
b
l
ame
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
A
l
exander G
a
v
rilov
gitk: Add option to specify the default commit on command
.
.
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-08-25
A
lexander Gavri
l
ov
git-
g
ui: Allow specifying an initial li
n
e for
git
g
ui
.
.
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-08-25
A
l
exander
Gav
r
ilov
git-
g
ui:
Bette
r
posit
i
o
n
in
g
i
n
Blame
P
arent Commit
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-08-25
Alexander G
a
vrilov
gi
t
-
g
ui:
S
up
p
ort passi
n
g
b
lame
t
o a parent commit
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-08-25
A
lex
a
nder Gavrilo
v
git-gui: S
u
pport starting gitk
f
rom Gui
Blame
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-08-24
Alexander Gav
r
ilov
Re
s
pect core
.
autocrlf
in combined
d
iff
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-08-11
A
l
e
xander Gavril
o
v
gitk: Allow safe
l
y
calling
n
ukefile from a run queue
.
.
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-07-31
Alexa
n
der Gavrilo
v
g
i
tk: Fallbac
k
to selecting the head commit upon load
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-07-31
Alex
a
nd
e
r
G
av
r
ilov
gitk: Fixed automatic row selection du
r
i
ng load
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-07-31
Alexand
e
r Gavr
i
l
o
v
gitk: Fixed
b
roke
n
e
xcepti
o
n
handl
i
ng in diff
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-07-31
Alexan
d
er Gavrilov
gitk: On Windows, use a Cygwin-sp
e
cific flag for kill
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-07-31
Ale
x
ander Gav
r
i
l
ov
gitk: Arr
a
n
ge
to kill di
f
f-files & diff-ind
e
x
o
n quit
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-07-31
Alexan
d
er
Gavrilov
gitk: Ki
l
l
b
a
ck-end processe
s
on window close
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-07-30
A
lexander
G
avrilov
Support copy an
d
rename detec
t
i
o
n in fast
-
export
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-07-27
Alexander Gavrilov
git-gui:
Preser
v
e
scroll p
o
sition on reshow_
d
i
ff
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-07-27
Alexan
d
er Gavrilov
g
it-
g
ui:
Fi
x
the Remote me
n
u separator
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-07-19
Al
e
xan
d
er Gavrilov
Support gitli
n
k
s in fast-import
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-07-17
A
l
e
x
ander Gavrilov
Add a menu
item to
i
n
vo
k
e full copy detect
i
on in blame
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-07-17
Alexander Gav
r
i
lov
Kill the
b
lam
e
b
ack-end on window close
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-07-17
A
l
e
xand
e
r Gavrilov
Add options to control
t
he search for
c
opie
s
i
n
blame
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-07-17
Alexander Gavri
l
ov
F
i
x pre-co
m
mi
t
hooks
under Min
G
W/MSYS
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-07-15
Alexander Gavrilov
Do no
t
t
r
y to dete
c
t mov
e
/copy for entries bel
o
w threshold
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-07-15
A
le
x
an
d
er Gav
r
ilov
Avoid rescanning unchanged
entries in searc
h
f
or copies
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree