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
Fix twoway_merge that passed d/f conflict marker to merged_entry().
2007-03-31
A
l
e
x Riesen
Keep r
e
na
m
e
/rename conflicts o
f
intermediate m
e
r
g
e
s
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2007-03-25
A
l
ex Riesen
Use diff* with --exit
-
c
od
e
in gi
t
-a
m
, git-rebase an
d
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2007-03-25
Alex Ries
e
n
Document --quiet optio
n
to git-diff
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2007-03-16
A
l
ex Riesen
Add tests for --qui
e
t opt
i
on of di
f
f
p
rograms
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2007-03-14
Alex Riesen
Allow gi
t
-diff exit with codes similar to diff(1)
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2007-03-07
Alex Riesen
All
o
w "m
a
k
e
-
w
"
generate i
t
s usual output
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2007-03-07
Ale
x
Riesen
Su
p
port of "make -s": do not output anything of the
.
.
.
commit
|
commitdiff
|
tree
2007-03-07
Alex Ri
e
sen
More build ou
t
p
u
t
c
l
ea
n
ing up
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2007-03-07
Alex Ri
e
sen
git-gui: Sup
p
ort of
"
make -s" in:
do not out
p
ut anythin
g
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2007-02-21
Alex
R
ies
e
n
disable t4016-diff-quote
.
sh
o
n some f
i
lesyste
m
s
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2007-02-07
Alex
R
iesen
Av
o
id ActiveSt
a
te P
e
rl IO in t800[12]
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2007-01-31
Alex
Riese
n
Fix gi
t
-update-index to work wi
t
h relati
v
e pathnames
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2007-01-25
Alex Riese
n
Al
l
ow default c
o
re
.
logallrefupdates to be overri
d
d
en
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2007-01-22
Alex Riesen
Cleanup uni
n
it
i
alized value in c
h
omp
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2007-01-22
Ale
x
Riese
n
Force Activestate Perl
to t
i
e
git command pipe handle
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2007-01-22
Alex Rie
s
en
I
n
s
e
rt
A
CT
I
VESTATE_ST
R
ING in Git
.
pm
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2007-01-10
Alex R
i
esen
Speed-u
p
recursive by fl
u
shing index only
once f
o
r
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2006-12-13
Alex Riesen
Clarify fetch error for
missing objects
.
commit
|
commitdiff
|
tree
2006-12-04
Alex Riesen
Mak
e
pe
r
l/ build proced
u
r
e
Act
i
veS
t
a
te friendly
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2006-11-29
A
l
e
x
R
i
e
sen
gi
t
-blame: f
i
x
rev p
a
r
ameter handling
.
commit
|
commitdiff
|
tree
2006-11-06
Alex R
i
esen
merge-
r
ecu
r
sive implic
i
tely depend
s
on trust_e
x
e
cutable_bit
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2006-09-29
Alex Riesen
d
o not disca
r
d
constness
i
n
interp
_
set_entry
v
alue
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2006-09-29
Alex Riesen
fix daemo
n
.
c co
m
pila
t
ion for NO_I
P
V6=
1
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2006-09-26
Alex Riese
n
Use con
s
t fo
r
interpolate arguments
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2006-07-25
Alex Ries
e
n
Tri
v
ial path opt
i
mization test
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2006-07-14
A
l
ex Ri
e
sen
Do not use
p
erl i
n
gi
t
-commit
.
sh
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2006-05-21
Al
e
x Riesen
remove superflous "const"
commit
|
commitdiff
|
tree
2006-04-23
Alex Riese
n
make update-index
--c
h
mod work with mu
l
ti
p
le
files
.
.
.
commit
|
commitdiff
|
tree
2006-03-03
Alex Riesen
w
o
rka
r
ound fat/nt
f
s
d
e
ficiencies
f
o
r t3600-rm
.
s
h (git-
r
m)
Signed-off-by:
Alex Riesen
<ariesen@harmanbecker.com>
commit
|
commitdiff
|
tree
2006-02-23
Alex Ries
e
n
PATCH: simplif
y
calls to git pro
g
rams in git-fmt-merge-msg
commit
|
commitdiff
|
tree
2006-02-23
Al
e
x
Riesen
fix t560
0
-clon
e
-fail-cl
e
anu
p
.
sh
o
n w
i
ndows
commit
|
commitdiff
|
tree
2006-02-12
Ale
x
Riesen
avoid echo
-e, there are systems where it does not
.
.
.
commit
|
commitdiff
|
tree
2006-02-12
Alex Ries
e
n
f
ix
"test: 2: unex
p
ected oper
a
tor" on bsd
commit
|
commitdiff
|
tree
2006-01-06
Al
e
x Rie
s
en
use GIT_
D
IR instead
of
/
v
ar/tmp
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2006-01-06
Alex Riesen
trivial: check,
if t
/
trash
d
i
rectory wa
s
succes
s
f
ully
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2006-01-06
Alex Ries
e
n
trivial:
.
gitignore
precompiled python
modules
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2006-01-06
A
l
e
x Riesen
tri
v
ial: use git-
r
epo-
c
onfi
g
to detect ho
w
to run tests
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2006-01-06
Al
e
x Ries
e
n
trivial: use gi
t
-
r
epo-confi
g
to detect
i
f t
h
e test
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2006-01-06
Ale
x
Riesen
trivial: remove th
e
d
ots at the en
d
of file names from
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2006-01-06
Alex
Riesen
trivial:
c
larify, what a
r
e the
c
onfi
g
's u
s
er
.
name and
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2006-01-06
A
lex R
i
es
e
n
trivial: ty
p
o
in
git-c
o
mmit
.
sh
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2006-01-06
Alex Riesen
use result of open(2
)
to c
h
ec
k
for pre
s
ence
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2006-01-06
Alex Riesen
fix potential dea
d
lock i
n
create_one_file
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2006-01-06
Ale
x
Riesen
triv
i
al: O_EX
C
L makes
O_TRUNC
redundant
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2006-01-06
Alex Riesen
trivial: retval of
w
aitpid is not err
n
o
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2005-12-22
A
l
ex Ries
e
n
\n usage in stderr output
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2005-12-09
Ale
x
Riesen
use "g
i
t init-db" in tests
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2005-12-02
Al
e
x Riese
n
git
wrapper: more careful argu
m
ent stuffing
[jc: Originally from
Alex Riesen
with inputs from Sven
commit
|
commitdiff
|
tree
2005-11-29
Al
e
x
R
iesen
[PAT
C
H] A
d
d tests f
o
r git-mv in s
u
bdirectories
commit
|
commitdiff
|
tree
2005-11-22
Alex Riesen
argume
n
t
s
cleanup
and some formattin
g
Signed-off-by:
Alex Riesen
<ariesen@harmanbecker.com>
commit
|
commitdiff
|
tree
2005-11-22
Alex Rie
s
en
remove un
u
sed varia
b
le
Signed-off-by:
Alex Riesen
<ariesen@harmanbecker.com>
commit
|
commitdiff
|
tree
2005-11-22
Alex Riesen
s
peedup a
l
location i
n
p
a
ck-
r
e
d
u
ndant
.
c
Signed-off-by:
Alex Riesen
<ariesen@harmanbecker.com>
commit
|
commitdiff
|
tree
2005-11-15
A
l
ex Riesen
a
l
low
g
it-update-
r
ef
create refs wi
t
h
slashes in n
a
mes
commit
|
commitdiff
|
tree
2005-11-08
Alex Riesen
make tes
t
s ignorable w
i
th "make
-
i"
commit
|
commitdiff
|
tree
2005-11-08
Alex Riesen
fi
x
t5000-tar-tr
e
e
.
sh when
$
T
A
R isn't
s
e
t
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2005-11-08
Alex
R
ies
e
n
ls-fi
l
es
a
nd
r
e
ad-
t
r
ee need core
.
filemo
d
e
commit
|
commitdiff
|
tree
2005-11-03
Alex Riesen
remove CR/LF f
r
om
.
gitignore
commit
|
commitdiff
|
tree
2005-10-06
Alex Riesen
Do not
require ls-remot
e
to be run inside a git repository
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2005-10-05
A
lex
R
i
ese
n
[P
A
TCH] h
o
ld_index_
f
ile_for_update should not unlink
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree