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: Show special diffs for complex conflict cases.
2008-09-05
A
lexander
Gavrilov
g
i
t
-
gui:
S
how special diffs
for com
p
lex conflict cases
.
Signed-off-by: Alexander Gavrilov <
angavrilov@gmail.com
>
commit
|
commitdiff
|
tree
2008-09-05
A
l
e
xander
Gavrilov
g
i
t
-
gui: Make F5 reselect
a
diff, if an untra
c
ked fil
e
.
.
.
Signed-off-by: Alexander Gavrilov <
angavrilov@gmail.com
>
commit
|
commitdiff
|
tree
2008-09-05
A
le
x
an
d
er
G
avrilov
git-gui: Reimpleme
n
t a
n
d enha
n
c
e auto-selection of
.
.
.
Signed-off-by: Alexander Gavrilov <
angavrilov@gmail.com
>
commit
|
commitdiff
|
tree
2008-09-05
Ale
x
an
d
er Gavrilov
git-gui: Supp
o
rt conflic
t
states _U & UT
.
Signed-off-by: Alexander Gavrilov <
angavrilov@gmail.com
>
commit
|
commitdiff
|
tree
2008-09-05
Alexa
n
der Ga
v
rilov
git-gui: Support mo
r
e
me
r
g
e t
o
ols
.
Signed-off-by: Alexander Gavrilov <
angavrilov@gmail.com
>
commit
|
commitdiff
|
tree
2008-09-05
Alexander Gavrilov
g
i
t-gui: D
o
n't a
l
l
ow s
t
agi
n
g
files
w
ith co
n
flicts
.
Signed-off-by: Alexander Gavrilov <
angavrilov@gmail.com
>
commit
|
commitdiff
|
tree
2008-09-05
Alexander Gavrilov
git-gui: Support call
i
ng merge to
o
ls
.
Signed-off-by: Alexander Gavrilov <
angavrilov@gmail.com
>
commit
|
commitdiff
|
tree
2008-09-05
Alexander Ga
v
ri
l
ov
g
it-gui: Support
r
es
o
lving conf
l
icts via
t
he diff conte
x
t
.
.
.
Signed-off-by: Alexander Gavrilov <
angavrilov@gmail.com
>
commit
|
commitdiff
|
tree
2008-09-01
A
l
exander
G
a
vrilov
gi
t
-
g
ui: Fix str
i
n
g
escapin
g
in po2msg
.
s
h
Signed-off-by: Alexander Gavrilov <
angavrilov@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-25
A
l
e
xander Gav
r
ilov
git-gui: Al
l
ow specify
i
ng an initi
a
l
line for git g
u
i
.
.
.
Signed-off-by: Alexander Gavrilov <
angavrilov@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-25
A
lexan
d
er Gavrilov
git-g
u
i: Bett
e
r po
s
it
i
oning in Blam
e
Pa
r
e
n
t Commit
Signed-off-by: Alexander Gavrilov <
angavrilov@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-25
A
lexande
r
G
a
vrilov
git-g
u
i: Support pass
i
ng blame to a parent commit
.
Signed-off-by: Alexander Gavrilov <
angavrilov@gmail.com
>
commit
|
commitdiff
|
tree
2008-08-25
Alexander
G
avrilov
git-gui:
S
upport startin
g
gitk
f
ro
m
Gui Bl
a
me
Signed-off-by: Alexander Gavrilov <
angavrilov@gmail.com
>
commit
|
commitdiff
|
tree
2008-07-27
Alexander Gavrilov
git-
g
ui: Preserve scroll
position on
reshow_diff
.
Signed-off-by: Alexander Gavrilov <
angavrilov@gmail.com
>
commit
|
commitdiff
|
tree
2008-07-27
Alexander Gav
r
i
lov
git-gui: Fix the Rem
o
te menu separator
.
Signed-off-by: Alexander Gavrilov <
angavrilov@gmail.com
>
commit
|
commitdiff
|
tree
2008-07-17
Alexander Gavrilov
A
d
d a
me
n
u ite
m
to i
n
voke full copy detect
i
on
i
n blame
.
Signed-off-by: Alexander Gavrilov <
angavrilov@gmail.com
>
commit
|
commitdiff
|
tree
2008-07-17
Alexande
r
Ga
v
r
ilov
K
ill
the blame back-end on windo
w
close
.
Signed-off-by: Alexander Gavrilov <
angavrilov@gmail.com
>
commit
|
commitdiff
|
tree
2008-07-17
Alexander
G
avrilov
Add options to control the s
e
arch for
copie
s
i
n
b
lame
.
Signed-off-by: Alexander Gavrilov <
angavrilov@gmail.com
>
commit
|
commitdiff
|
tree
2008-07-17
Alexan
d
er Gavr
i
lov
Fix
pre-commit hooks under MinGW/MSY
S
Signed-off-by: Alexander Gavrilov <
angavrilov@gmail.com
>
commit
|
commitdiff
|
tree