repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jm/mergetool-submodules' into maint
2011-04-01
Alex Riesen
clean: unreadable direc
t
ory may s
t
ill be rmdi
r
-able
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2011-03-29
A
lex Riesen
HOME m
u
st be set before calling git-init
w
hen
creati
n
g
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2011-01-24
Alex Rie
s
en
git-gu
i
: update russian translation
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2011-01-24
Al
e
x Riesen
git-gui: update
russian transla
t
ion
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2010-07-05
Ale
x
Riesen
Convert the users of f
o
r_each
_
stri
n
g_list to f
o
r_each_string
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2010-07-05
Al
e
x R
i
esen
Add
a
for_each_string_
l
ist_item macro
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
Alex Ri
e
sen
Us
e
s
trbufs i
n
stead of open-
c
oded str
i
ng ma
n
ipul
a
tion
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2010-03-28
Al
e
x Riesen
Al
l
ow passing of confi
g
uration parameters in the command
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2009-08-31
Al
e
x Riesen
Add d
a
te formatting and parsin
g
f
u
nctions relat
i
ve
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2009-08-12
Ale
x
Riesen
git-
g
ui
:
Update
rus
s
ian
trans
l
ation
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2009-07-29
Alex Riesen
Add
a re
m
in
d
er test case for a
m
erge wit
h
F/D tr
a
nsition
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2009-05-24
Alex Riesen
http-pus
h
.
c::
r
emove_
l
ocks(): fix use after
f
r
ee
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2009-05-17
A
l
e
x
R
iesen
Impro
v
e the
n
aming of
guessed target repository for
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2009-05-17
A
lex Ries
e
n
Use
U
TF-8 ins
t
e
a
d of utf8 for backwar
d
c
omp
a
tib
i
li
t
y
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2009-05-13
A
lex
R
iesen
Quote LF
i
n urls git fetch sa
v
es
i
n
FETCH_
H
E
AD
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2009-05-10
Alex Riesen
ls-tree
manpage:
o
utput of ls-tr
e
e is
c
ompatible wi
t
h
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2009-05-10
Ale
x
Riese
n
ls-t
r
e
e
manpag
e
: use
"unless"
instead of "whe
n
.
.
.
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2009-05-09
Alex Riesen
Clarify kind of conflict i
n
merge-one
-
fi
l
e
helper
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2009-05-06
Alex
Riesen
impr
o
ve e
r
ror message in
c
o
nfig
.
c
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2009-04-30
Alex Rie
s
e
n
gitk: Add Russian tr
a
nslat
i
on
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2009-04-30
Alex Riesen
Clari
f
y
k
ind of
c
onflict in m
e
rge
-
one-file helper
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2009-04-30
Ale
x
R
i
e
sen
i
m
prove error message in con
f
ig
.
c
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2009-04-30
Alex
Riese
n
print unlink(2) errno in
copy_o
r
_link_
d
irectory
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2009-04-30
Alex Riesen
replace dire
c
t c
a
lls to unlink(2)
w
ith u
n
link_
o
r_warn
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2009-04-30
Alex R
i
esen
Intro
d
uce an un
l
ink(2) wra
p
per w
h
ich gives w
a
rning
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2009-04-29
Alex Rie
s
en
gi
t
-g
u
i: Up
d
ate Russ
i
an
t
ra
n
slat
i
o
n
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2009-04-24
Alex Riesen
Explain seemingly pointless use of
s
y
stem in difftool
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2009-04-23
Alex Ries
e
n
W
a
i
t for git diff to f
i
n
i
sh in git
difftool
commit
|
commitdiff
|
tree
2009-03-23
Alex Ries
e
n
Impro
v
e e
r
ror message
a
bout fe
t
c
h into current
b
ra
n
ch
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2009-03-20
Alex Riesen
Microoptimize strb
u
f_cmp
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2009-03-20
Alex Riesen
Pr
o
duce a nicer output
i
n
case of sha1_ob
j
ect
_
info
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2009-03-17
Alex
Riesen
disable p
o
s
t
-c
h
eckout test on Cygwin
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2008-12-05
A
l
e
x
Riesen
R
e
port sym
l
in
k
failure
s
in merge-r
e
cur
s
ive
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2008-12-05
Alex Riesen
Make chdir fail
u
res
visi
b
le
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2008-12-05
Alex Riesen
Make some of
f
write/fc
l
ose/write/close failures
v
i
s
i
b
le
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2008-11-24
A
lex
R
iesen
Fix t4
0
30-dif
f
-
textconv
.
sh
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2008-11-24
Alex Riesen
Fix handle lea
k
i
n
sha1_file
/
unpack_objects
if th
e
re
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2008-10-31
A
l
ex Ri
e
sen
Use test-chmtime -v instead of
p
erl
i
n
t5000 to get
.
.
.
Signed-off-by:
Alex Riesen
<ariesen@harmanbecker.com>
commit
|
commitdiff
|
tree
2008-10-31
Alex
Riesen
Add -
-
verbose|-v to test-chmtime
Signed-off-by:
Alex Riesen
<ariesen@harmanbecker.com>
commit
|
commitdiff
|
tree
2008-10-31
Alex
R
i
e
sen
Use git
_
pa
t
hdup instead of xstr
d
up(git_path(
.
.
.
))
commit
|
commitdiff
|
tree
2008-10-31
Alex Riesen
gi
t
_pathdup: re
t
urns
x
strd
u
p-ed co
p
y of the for
m
at
t
ed
.
.
.
commit
|
commitdiff
|
tree
2008-10-31
A
l
ex Riese
n
F
i
x potentially da
n
gerous use
o
f git_path
in ref
.
c
commit
|
commitdiff
|
tree
2008-10-31
Alex Riesen
Add g
i
t_snpath: a
.
git path formatting routine
with
.
.
.
commit
|
commitdiff
|
tree
2008-10-30
Ale
x
Riese
n
Pl
u
g a mem
l
eak in bui
l
tin-rever
t
commit
|
commitdiff
|
tree
2008-10-27
A
l
ex Riesen
F
ix p
o
ten
t
ially danger
o
us uses o
f
mk
p
ath and
g
it_path
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2008-10-27
Alex Ri
e
sen
Fi
x
poten
t
ially dange
r
ous
us
e
s o
f
mkpath and git_pa
t
h
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2008-10-27
Alex R
i
es
e
n
Fi
x
mkpath abuse in dwim_ref and dw
i
m_log of sha
1
_name
.
c
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2008-10-27
Alex Riesen
Add
mksnpath which allow
s
you to specify the output
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2008-09-29
Alex Riesen
Use remove_path from di
r
.
c instead of
o
w
n im
p
lement
a
t
i
o
n
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2008-09-29
A
lex Riesen
A
dd remo
v
e_path: a fu
n
ction to
r
emove
a
s much as possible
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2008-09-26
Alex
R
i
es
e
n
Clea
n
u
p
r
e
m
ove_
p
a
t
h
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2008-09-26
Alex Riesen
Remove empty directories in r
e
cursive merge
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2008-08-31
Alex Riesen
A
dd help
.
autoc
o
rrect to enable/disabl
e
aut
o
c
o
r
r
ecti
n
g
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2008-08-30
Alex Rie
s
en
Fix use
of
h
ar
d
li
n
ks
i
n "make ins
t
all
"
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2008-08-29
Alex Rie
s
en
list_c
o
mmands: only call
git_exec_path if i
t
is neede
d
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2008-08-29
Al
e
x Riesen
Allow git help work wit
h
out PATH set
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2008-08-29
A
l
ex Riesen
Make main_cmd
s
and
other_cmds local
t
o builtin-help
.
c
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2008-08-29
Al
e
x Riesen
Remove u
s
e
l
e
ss m
e
mset o
f
stat
i
c command
n
am
e
lists
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2008-08-29
Ale
x
Riesen
Remov
e
calcul
a
tion of
t
he longest co
m
mand name from
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2008-08-23
Al
e
x Ri
e
s
e
n
Exten
d
"checkout --tra
c
k" DWIM to support more cases
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2008-08-15
A
lex Riesen
Fix t3700 on filesystems wh
i
c
h
do
no
t
support quest
i
on
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2008-07-29
Alex Riese
n
Make use of stat
.
ctime configurable
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2008-07-23
Alex Riesen
Allow pager of dif
f
command
b
e
enabl
e
d/disable
d
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2008-07-07
Alex Riesen
git-clone: remove leftover debugging fprintf()
.
commit
|
commitdiff
|
tree
2008-06-26
A
lex Riesen
Fix use
o
f "perl -i" on Windows
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2008-06-04
Alex Rie
s
e
n
Fix t5516
on cygwin: it d
o
es not like dou
b
le slashes
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2008-05-21
Alex Riese
n
Fix t3701 if core
.
fil
e
mode disabled
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2008-05-21
A
l
ex Riesen
Fix t6031 on fil
e
systems without
w
or
k
ing exe
c
b
i
t
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2008-05-19
Alex R
i
esen
Ensure t
h
at a test
i
s run i
n
the trash directory
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2008-05-13
A
l
ex Ri
e
se
n
Add a config
option
t
o i
g
n
o
re errors f
o
r gi
t
-
add
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2008-05-13
Alex Ri
e
s
en
A
dd a
t
est
f
o
r
g
it-add --ignore
-
err
o
rs
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2008-05-13
Al
e
x Rie
s
en
Add --ignore-e
r
rors
to git-add to
al
l
ow it to skip
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2008-05-13
Alex Rie
s
en
Extend interf
a
c
e of
add_files_to_cache to allow
ig
n
ore
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2008-05-13
Ale
x
Riesen
Make the exit code of add_
f
ile_to_
i
ndex ac
t
ually
u
seful
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2008-05-13
Alex Riesen
I
m
pr
o
v
e
reporting
o
f errors in config file
r
outines
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2008-04-30
A
l
ex Riese
n
Use the modern s
y
nta
x
of git
-
diff-files in t200
2
-c
h
eckout
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2008-04-29
Ale
x
Riesen
Fix us
e
a
f
te
r
fre
e
(
) in builtin-fetch
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2008-04-28
Alex Riesen
Use "
=
" i
n
s
t
ead of "=="
in con
d
i
t
i
on a
s
it is
m
o
re
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2008-03-15
Alex
R
iesen
git-gui: update russian translation
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2008-03-05
Alex Riesen
Do not use GUID on dir i
n
git init --shared=all on
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2008-03-04
Alex Rie
s
en
Fix test for c
l
eanup failure in t7300 on Windows
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2008-02-29
Alex Riesen
Fix builtin chec
k
ou
t
c
r
as
h
ing when gi
v
en an inv
a
lid
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2008-01-22
Alex R
i
es
e
n
Make t5
7
10 more st
r
i
ct
w
h
e
n
c
reating nested repos
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2007-12-23
Alex Ries
e
n
Allow selectio
n
of d
i
fferent c
l
e
a
nup modes for commit
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2007-12-12
Alex Ri
e
sen
F
ix
gi
t
-fast-exp
o
rt
f
o
r
z
ero
-
s
i
zed blobs
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2007-12-04
Ale
x
Riesen
Simplify crud() in ident
.
c
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2007-11-28
Alex Riesen
Do
n
ot gen
e
rate full c
o
mmit
log message if
i
t
i
s
n
o
t
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2007-11-14
A
lex
Ri
e
sen
Fix dependencies of
p
arse-options test
progr
a
m
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2007-11-13
Alex Riesen
U
pdate the t
r
ac
k
in
g
r
e
feren
c
es only
i
f
t
hey were suc
c
esf
u
lly
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2007-11-13
A
l
ex
Riesen
Add
a t
e
st
chec
k
i
ng if send-pack upda
t
ed l
o
cal tracking
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2007-11-09
Ale
x
Riesen
stop
t
1400 hiding erro
r
s in tests
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2007-11-01
Alex Riesen
Do no colorify
tes
t
outp
u
t
if stdout is not
a
t
e
r
minal
commit
|
commitdiff
|
tree
2007-11-01
Alex Riesen
Updated rus
s
i
a
n
t
ranslation
o
f
g
it-gui
commit
|
commitdiff
|
tree
2007-10-30
Alex Riesen
Rework make_u
s
a
ge to pri
n
t th
e
usage message immediately
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2007-10-26
Alex Riesen
Fix
generation
of perl/p
e
rl
.
m
a
k
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2007-10-23
Alex Riesen
More updates and corrections to the russ
i
an translation
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2007-10-16
Alex
R
i
esen
Fix
a crash i
n
ls-remote when refs
p
ec
expand
s
into
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2007-10-16
Alex
R
iesen
fix
t
540
3
-po
s
t-ch
e
ckout-h
o
ok
.
sh:
b
uil
t
-in test
in dash
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2007-08-31
Alex Riesen
Tempor
a
ry fix
for sta
c
k smashing in m
a
i
li
n
fo
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2007-08-22
A
l
ex Ries
e
n
Fi
x
g
i
t-remote for Act
i
veState Perl
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
next