repo.or.cz
/
git
/
dscho.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Show a failure of rebase -p if the merge had a conflict
2008-12-15
Alexa
n
der Gavrilov
Do
c
ument
a
tion: D
e
scrib
e
git
-
gui Tools
m
e
nu con
f
iguratio
n
.
.
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-12-08
Alexan
d
er
Gav
r
ilov
gi
t
-gui:
F
i
x c
o
mmit encod
i
ng handl
i
ng
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-12-08
Al
e
xander Ga
v
r
ilov
git-gui: Fix han
d
lin
g
of relative paths in
b
l
a
m
e
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-12-01
Alexander Gavrilov
git
k
: Add a menu
o
pt
i
on
to start git g
u
i
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-12-01
A
l
exander Gavrilov
gitk: Make li
n
e origin
s
earch update the bus
y
status
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-11-18
A
lexa
n
der
G
a
v
ri
l
ov
gi
t
k: Avoid
h
andling
the Retur
n
key twice in Add Branch
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-11-16
Alexander G
a
vr
i
l
ov
gi
t
-
gui: Fix t
h
e s
e
arch bar destr
u
ction handler
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-11-16
Alex
a
nder Gavr
i
lov
git
-
gui
:
Implement aut
o
matic res
c
an
after Too
l
execution
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-11-16
Alexand
e
r Ga
v
rilov
gi
t
-gui
:
Allow
Tools r
e
quest argum
e
nts
f
rom the user
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-11-16
Ale
x
ander Gavri
l
ov
git-gui:
Add a Too
l
s m
e
nu
f
or ar
b
it
r
ar
y
command
s
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-11-16
Ale
x
a
n
d
er
Ga
v
ril
o
v
git-gui:
F
ix the after callback exe
c
ut
i
o
n in rescan
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-11-16
A
lex
a
nder Ga
v
rilov
git-gui: Impleme
n
t system
-
wi
d
e
configuratio
n
handling
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-11-15
Alexand
e
r Gavrilov
Documenta
t
ion
:
New GUI configuration and co
m
m
and-l
i
n
e
.
.
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-11-13
A
lexander Ga
v
r
i
lov
gitk: Fix commit encoding s
u
pport
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-11-13
Ale
x
ander G
a
v
r
i
lov
g
i
tk: Fix transient window
s
on
Win
3
2
a
n
d
MacOS
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-11-13
Alexander
G
avril
o
v
gitk
:
Ad
d
a
ccele
r
ators to freque
n
tly
used menu command
s
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-11-11
Ale
x
ander Gavrilov
git-g
u
i: Request blame metadata in
utf-8
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-11-11
A
lexa
n
der Gavril
o
v
git-gui
:
Add the Sh
o
w
SSH Key
i
tem to the clone dialog
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-11-11
Alexand
e
r Gavril
o
v
git-
g
ui: Fix focus transiti
o
n in the blame viewer
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-11-08
Ale
x
ande
r
Gavri
l
ov
gitk
:
Implement a user-
f
r
ien
d
l
y
Edit Vie
w
d
i
alog
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-11-07
Alex
a
nd
e
r Gavr
i
lov
gitk: Ma
k
e
c
h
e
rry-pick
call git-citool on conflicts
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-11-07
Al
e
x
ander Gavrilov
g
i
t
k:
M
a
ke gitk dialog wi
n
dows transient
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-11-07
Alexander Gavrilov
gitk: A
d
d Retu
r
n
a
nd Esca
p
e b
i
nding
s
to dialogs
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-11-07
Alexand
e
r Ga
v
ri
l
ov
gitweb:
F
ix mod_perl support
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-11-07
Alexan
d
er Gavri
l
ov
g
it
w
eb: Add a per-repository author
i
za
t
ion ho
o
k
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-11-07
Alexa
n
der
Gavri
l
ov
gitw
e
b
:
Use s
i
ngle i
m
plementation
o
f e
x
port_
o
k check
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-11-06
Alexa
n
d
e
r
Gavrilo
v
Windo
w
s: Make OpenSSH pro
p
erly
det
e
ct tty detac
h
ment
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-11-01
Ale
x
ander
G
avrilov
git-gui: Ad
d
a simple implementat
i
on of SSH
_
ASKPASS
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-11-01
Alexander
G
a
vril
o
v
git-g
u
i: Add
a
d
ia
l
o
g t
h
at shows th
e
Op
e
nSSH pu
b
lic
.
.
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-10-26
Alexa
n
der Gavrilov
g
itk: Allow starting
g
ui
bla
m
e
for a s
p
ecific line
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-10-21
Alexander Gav
r
ilov
builti
n
-
blame: Reencode commit me
s
sa
g
es according to
.
.
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-10-21
A
lexan
d
er G
a
vrilov
g
itk: Fix file lis
t
context
m
e
nu
f
or merge commits
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-10-21
A
l
ex
a
nder Gavrilov
g
i
tk: Allow forcing branch crea
t
ion if
i
t
al
r
ead
y
exists
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-10-14
Alexa
n
der Gavril
o
v
git
k
: Impl
e
ment batch lookup an
d
caching of enc
o
ding
.
.
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-10-14
A
le
x
ander
Gavrilov
gitk: En
h
ance file e
n
cod
i
n
g sup
p
ort
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-10-10
Alexan
d
er G
a
vrilov
git-gui: F
i
x the blame viewer
destroy
h
andler
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-10-10
Alex
a
nder
G
avrilov
git-gui:
A
dd a search command to the blame viewer
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-10-10
Alexander Gavrilov
g
it-gui: Fix the blame
window sha
p
e
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-10-06
A
l
exander Ga
v
ril
o
v
builtin-blame: Fix bl
a
me -
C
-C wi
t
h submodul
e
s
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-09-30
Ale
x
ander Gavrilov
gi
t
-gui: Make
Ctrl-
T
saf
e
to use
f
o
r conflictin
g
files
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-09-24
Alexander Gavri
l
ov
git-
g
ui: Reenable staging unmerge
d
fil
e
s by
c
l
icking
.
.
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-09-24
Alexa
n
der
G
av
r
ilov
git-gui: Support the enco
d
ing menu in gu
i
blame
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-09-24
Ale
x
ande
r
Gavrilo
v
git-
g
ui: Op
t
imize encoding name resolu
t
i
o
n using a
.
.
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-09-24
A
l
ex
a
n
der Gavril
o
v
git-gui:
Allow forcing
d
i
splay en
c
oding for di
f
f
s
u
s
ing
.
.
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-09-24
Ale
x
ande
r
G
avrilov
g
it-gui: Add a menu of ava
i
la
b
le enc
o
dings
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-09-24
A
l
exan
d
er Gavril
o
v
git-gui
:
Cl
e
anup handling of the default encodin
g
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-09-24
Alex
a
n
de
r
G
a
vrilov
git-
g
ui: Add more integr
a
t
ion options to citool
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-09-21
Alexander Gavr
i
lov
gi
t
k: Fi
x
a bug
i
n collapsing
dee
p
l
y
n
e
sted
trees
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-09-12
Alexander Gavr
i
lov
gi
t
-gui: Restore a
b
i
lity to Sta
g
e Wor
k
ing Copy for
.
.
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-09-12
Alexa
n
der Gav
r
ilov
git-gu
i
: Fix Blame Par
e
nt &
C
ont
e
xt f
o
r
working copy
.
.
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-09-05
Alexa
n
der
Gavrilov
git-gui: Sh
o
w s
p
ecial diffs for complex conf
l
ict cas
e
s
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-09-05
A
lexander Gavr
i
l
ov
g
i
t-gui: Make F5
reselect a diff
,
if an
u
ntra
c
ke
d
fi
l
e
.
.
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-09-05
Alexander Gavrilov
git-gui
:
Reimplement an
d
enha
n
c
e
auto-sele
c
tion of
.
.
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-09-05
Alexander Gavril
o
v
g
i
t-gui: Support conflict
states _U
&
UT
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-09-05
Alex
a
nde
r
G
a
v
ril
o
v
gi
t
-gui
:
Support more me
r
ge to
o
l
s
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-09-05
Alexande
r
Gavrilov
git-g
u
i
:
Don't all
o
w
stag
i
ng files with co
n
flicts
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-09-05
Alexand
e
r Gavrilov
git
-
g
u
i:
S
upport ca
l
ling merge tool
s
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-09-05
Al
e
xander Gavrilov
git-g
u
i: Su
p
port re
s
olving confli
c
ts via the dif
f
context
.
.
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-09-01
A
l
exa
n
d
e
r Gav
r
ilov
g
i
t-g
u
i: Fix string escaping in po2ms
g
.
sh
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
Alexander Ga
v
rilov
gitk:
A
d
d menu
item for calling git gui blam
e
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-08-26
Alexand
e
r
G
avrilov
g
i
t
k: Add option to spec
i
fy the default commit on co
m
mand
.
.
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-08-25
A
l
exander Gavrilov
git-gui: A
l
l
o
w
specifying an initial lin
e
f
o
r git gu
i
.
.
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-08-25
Alex
a
nder Ga
v
rilov
git-gui: Better positioning in Blame
Paren
t
Co
m
mi
t
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-08-25
Al
e
x
ander G
a
vrilov
git-gui: Support passing blame t
o
a parent comm
i
t
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-08-25
Alexander Gavril
o
v
git-gui:
S
uppo
r
t starting gitk from Gui B
l
ame
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-08-24
Alexander Gavrilov
R
espect core
.
aut
o
crlf in comb
i
n
ed di
f
f
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-08-11
Alexande
r
Gav
r
ilov
git
k
: Allow safely calling
n
u
kefile fro
m
a run q
u
e
u
e
.
.
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-07-31
Alexa
n
der Gavrilov
gitk: Fallback
to s
e
lectin
g
the
h
e
ad c
o
mmit upo
n
load
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-07-31
Alexande
r
Gavril
o
v
git
k
: Fixed au
t
omatic row selection during load
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-07-31
A
l
e
x
a
n
d
e
r
Gav
r
ilov
g
i
tk: Fi
x
e
d
broken e
x
ception hand
l
ing
i
n di
f
f
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-07-31
Alex
a
nd
e
r
Gavrilov
gitk: On Wi
n
do
w
s, use a Cygwin-specific fla
g
for kill
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-07-31
A
l
e
xander
G
avrilov
git
k
: Arrange to kill di
f
f-files
& diff-i
n
dex on quit
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-07-31
Alexan
d
er Gavri
l
ov
gi
t
k: Kill
b
ack-
e
nd processes on window close
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-07-30
Al
e
xander Gavrilov
Support copy and rename detection in fa
s
t-export
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-07-27
Al
e
xander Gavrilov
git-gui: Preserve s
c
roll position
on
r
esh
o
w_diff
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-07-27
A
l
exan
d
er Gavril
o
v
g
it-gui: Fix the
R
emote me
n
u se
p
arator
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-07-19
Alexander Gavrilov
S
u
pport gitlinks in fast-imp
o
rt
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-07-17
A
lexander Gavrilov
Add a menu item to invoke
f
ull
copy detection
in blame
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-07-17
Ale
x
ander
G
avrilov
Kill the blame back
-
end on w
i
ndow close
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-07-17
Alexander Gavrilov
Add
o
p
t
ions to contro
l
the search for
c
opie
s
in blame
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-07-17
Alexa
n
der Gavrilov
Fix p
r
e-commit hook
s
under MinGW/MSYS
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-07-15
Alexander Gavrilo
v
Do not try to
d
etect move/copy for entr
i
es below thr
e
shold
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree
2008-07-15
Ale
x
ander Gav
r
i
l
ov
Avoid rescan
n
i
n
g
u
nchanged e
n
tries in se
a
r
c
h
for copies
.
Signed-off-by:
Alexander Gavrilov
<angavrilov@gmail.com>
commit
|
commitdiff
|
tree