repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
test that git status works with merge conflict in, .gitmodules
2011-05-14
Heiko Voigt
t
e
s
t
that g
i
t status w
o
rks w
i
th merge co
n
fl
i
ct in,
.
.
.
Signed-off-by:
Heiko Voigt
<hvoigt@hvoigt.net>
commit
|
commitdiff
|
tree
2011-02-24
Heiko V
o
igt
git-g
u
i: fetch/
p
rune all entry appears last
Signed-off-by:
Heiko Voigt
<hvoigt@hvoigt.net>
commit
|
commitdiff
|
tree
2011-02-24
Heiko Voig
t
git-gui: fetch/
p
rune all e
n
try
on
l
y for more than
o
ne
.
.
.
Signed-off-by:
Heiko Voigt
<hvoigt@hvoigt.net>
commit
|
commitdiff
|
tree
2011-02-14
Heiko Vo
i
g
t
git-gui: tea
c
h fetch/pru
n
e menu to
d
o
i
t for all remo
t
es
Signed-off-by:
Heiko Voigt
<heiko.voigt@mahr.de>
commit
|
commitdiff
|
tree
2011-02-14
Heik
o
Vo
i
gt
git
-
gui: refactor remote s
u
bm
e
nu crea
t
ion into
s
ubr
o
utine
Signed-off-by:
Heiko Voigt
<heiko.voigt@mahr.de>
commit
|
commitdiff
|
tree
2011-02-13
H
eiko Vo
i
g
t
gi
t
-g
u
i: a
l
ways de
f
ault to the last merged
b
r
anch in
.
.
.
Signed-off-by:
Heiko Voigt
<hvoigt@hvoigt.net>
commit
|
commitdiff
|
tree
2011-02-13
Heiko
Voigt
git-gui: fix
de
l
eting item from
a
ll_remotes v
a
ria
b
le
Signed-off-by:
Heiko Voigt
<heiko.voigt@mahr.de>
commit
|
commitdiff
|
tree
2011-02-07
Heiko Voigt
mingw: ad
d
fallbac
k
for rmdir
i
n case
d
i
r
ec
t
ory
i
s
.
.
.
Signed-off-by:
Heiko Voigt
<heiko.voigt@mahr.de>
commit
|
commitdiff
|
tree
2011-02-07
Heiko
V
oigt
mingw: make
f
ailures t
o
unlink or
m
o
v
e
r
aise a question
Signed-off-by:
Heiko Voigt
<hvoigt@hvoigt.net>
commit
|
commitdiff
|
tree
2011-02-07
H
eiko
V
oigt
min
g
w:
work
around irregu
l
ar failur
e
s of unlink on
.
.
.
Signed-off-by:
Heiko Voigt
<hvoigt@hvoigt.net>
commit
|
commitdiff
|
tree
2011-02-07
Hei
k
o Voigt
mingw: m
o
v
e
u
n
link wrapper t
o
m
ingw
.
c
Signed-off-by:
Heiko Voigt
<hvoigt@hvoigt.net>
commit
|
commitdiff
|
tree
2011-02-06
H
e
i
ko Voigt
gi
t
-gui
:
instead of
d
efaulting to home
d
i
r
ectory use
.
.
.
Signed-off-by:
Heiko Voigt
<hvoigt@hvoigt.net>
commit
|
commitdiff
|
tree
2011-02-06
Heik
o
V
oigt
git-gui: sc
r
oll down to default selection
for push
.
.
.
Signed-off-by:
Heiko Voigt
<hvoigt@hvoigt.net>
commit
|
commitdiff
|
tree
2011-02-06
Heik
o
Voigt
git gui: keep sel
e
cted
b
ranch when remote is
c
h
a
nged
.
.
.
Signed-off-by:
Heiko Voigt
<hvoigt@hvoigt.net>
commit
|
commitdiff
|
tree
2010-07-30
Heik
o
Voigt
git-g
u
i: fix short
c
ut cre
a
tion o
n
cygwin
Signed-off-by:
Heiko Voigt
<hvoigt@hvoigt.net>
commit
|
commitdiff
|
tree
2010-07-30
Heiko Voi
g
t
git-g
u
i
: fix PATH
envi
r
onm
e
nt for mingw
d
e
velop
m
ent
.
.
.
Signed-off-by:
Heiko Voigt
<hvoigt@hvoigt.net>
commit
|
commitdiff
|
tree
2010-07-30
Heiko Voig
t
git
-
g
u
i
:
fix u
s
a
ge of _gitworktr
e
e whe
n
creat
i
ng sho
r
tcut
.
.
.
Signed-off-by:
Heiko Voigt
<heiko.voigt@mahr.de>
commit
|
commitdiff
|
tree
2010-07-14
H
e
i
k
o
Voigt
add configuration var
i
a
ble
f
or --autosquash option
.
.
.
Signed-off-by:
Heiko Voigt
<hvoigt@hvoigt.net>
commit
|
commitdiff
|
tree
2010-07-10
Heiko Voigt
git-gui:
fix usage
o
f themed widgets
v
ariable
Signed-off-by:
Heiko Voigt
<hvoigt@hvoigt.net>
commit
|
commitdiff
|
tree
2010-07-07
H
eiko Voigt
Implement automatic fast-forward
merge
for sub
m
odul
e
s
Signed-off-by:
Heiko Voigt
<hvoigt@hvoigt.net>
commit
|
commitdiff
|
tree
2010-07-07
Heiko Vo
i
g
t
setu
p
_rev
i
sions()
:
Allow walking hi
s
tory in a
s
u
b
m
o
d
u
l
e
Signed-off-by:
Heiko Voigt
<hvoigt@hvoigt.net>
commit
|
commitdiff
|
tree
2010-07-07
Hei
k
o Voigt
T
each
r
ef iteration module about submodule
s
Signed-off-by:
Heiko Voigt
<hvoigt@hvoigt.net>
commit
|
commitdiff
|
tree
2010-07-07
Hei
k
o
Voigt
add m
i
ssing && to submodule-mer
g
e testcas
e
Signed-off-by:
Heiko Voigt
<hvoigt@hvoigt.net>
commit
|
commitdiff
|
tree
2010-02-08
Heiko
V
oigt
git
-
gui: chec
k
whe
t
her syst
e
ms nice comman
d
works or
.
.
.
Signed-off-by:
Heiko Voigt
<hvoigt@hvoigt.net>
commit
|
commitdiff
|
tree
2010-01-29
Heiko Voigt
git-gui: fix short
c
ut for menu
"
Commit/R
e
ver
t
Changes"
Signed-off-by:
Heiko Voigt
<heiko.voigt@mahr.de>
commit
|
commitdiff
|
tree
2009-12-05
Hei
k
o Voigt
git
g
ui:
m
ake current br
a
n
ch
d
ef
a
ult in
"
r
emote delete
.
.
.
Signed-off-by:
Heiko Voigt
<hvoigt@hvoigt.net>
commit
|
commitdiff
|
tree
2009-09-14
Heiko Voigt
web--browse: fix Mac OS X GUI
d
etection for 1
0
.
6
Signed-off-by:
Heiko Voigt
<hvoigt@hvoigt.net>
commit
|
commitdiff
|
tree
2009-09-14
Heiko Voigt
remove lo
g
i
cal t
y
po in
d
o
cumentation of sample upd
a
te
.
.
.
Signed-off-by:
Heiko Voigt
<hvoigt@hvoigt.net>
commit
|
commitdiff
|
tree
2009-08-10
H
e
i
k
o
Voi
g
t
git-gui: remove warn
i
n
g when de
l
eting corr
e
ctly merg
e
d
.
.
.
Signed-off-by:
Heiko Voigt
<hvoigt@hvoigt.net>
commit
|
commitdiff
|
tree
2009-05-20
Heiko Voigt
Extend
sample
pr
e
-
commit hook
to check for
non ascii
.
.
.
Signed-off-by:
Heiko Voigt
<hvoigt@hvoigt.net>
commit
|
commitdiff
|
tree
2009-05-09
H
e
i
ko
Voigt
E
x
tend sampl
e
upd
a
te h
o
ok, disab
l
e
mo
d
ifying o
f
existin
g
.
.
.
Signed-off-by:
Heiko Voigt
<heiko.voigt@mahr.de>
commit
|
commitdiff
|
tree
2009-04-06
Heiko Voig
t
Ad
d
c
on
f
iguration variable for sign-off to format-patch
Signed-off-by:
Heiko Voigt
<hvoigt@hvoigt.net>
commit
|
commitdiff
|
tree
2009-04-01
Heiko Voigt
Cleanup warning about known issues in cvsim
p
ort documentation
Signed-off-by:
Heiko Voigt
<hvoigt@hvoigt.net>
commit
|
commitdiff
|
tree
2009-03-25
Heiko Voigt
Add warnin
g
abo
u
t known issues
t
o
do
c
umentatio
n
of
.
.
.
Signed-off-by:
Heiko Voigt
<hvoigt@hvoigt.net>
commit
|
commitdiff
|
tree
2009-03-21
Heiko Voigt
c
vsimport:
extend testcase ab
o
ut
patchset
orde
r
to
.
.
.
Signed-off-by:
Heiko Voigt
<hvoigt@hvoigt.net>
commit
|
commitdiff
|
tree
2009-03-21
H
ei
k
o Voi
g
t
cvsimport: add tes
t
illus
t
ra
t
ing a bug in cvsps
Signed-off-by:
Heiko Voigt
<hvoigt@hvoigt.net>
commit
|
commitdiff
|
tree