repo.or.cz
/
git.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
ex Riesen
K
eep
r
e
n
am
e
/re
n
ame conf
l
icts o
f
intermedi
a
te
m
e
rg
e
s
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2007-03-25
Ale
x
Riesen
Use
d
iff*
w
ith --exit
-
code
in
git-am, git-rebase and
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2007-03-25
A
l
ex Riesen
Docume
n
t --q
u
iet
o
ption
t
o
git-diff
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2007-03-16
Alex Riese
n
Ad
d
tests for --quiet
o
p
tion of di
f
f
p
r
ograms
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2007-03-14
A
l
ex Ri
e
sen
Allo
w
gi
t
-d
i
f
f
e
x
i
t
w
it
h
c
odes
s
imilar to diff(1)
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2007-03-07
Alex Ri
e
sen
A
llow "make
-
w"
g
enerate its usual output
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2007-03-07
Alex Rie
s
en
Support of "make
-
s":
d
o not
output anything of the
.
.
.
commit
|
commitdiff
|
tree
2007-03-07
Alex Riesen
Mor
e
build output cleani
n
g up
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2007-03-07
A
l
ex Riesen
git-gui: Support of "make -
s
" in
:
do not output a
n
y
thing
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2007-02-21
Ale
x
Riesen
dis
a
ble t4016-diff-quote
.
s
h on some filesystem
s
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2007-02-07
A
le
x
Riesen
Avoid Act
i
veState
Pe
r
l
IO
i
n t800
[
12]
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2007-01-31
A
l
ex
Riesen
Fix
g
it-u
p
dat
e
-index to
w
o
rk with r
e
lative pathnames
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2007-01-25
Alex Riese
n
Allow defaul
t
core
.
logallrefup
d
a
tes to
b
e overridden
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2007-01-22
Alex Rie
s
en
C
leanup un
i
nit
i
alized value in chom
p
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2007-01-22
Alex Riesen
Force Acti
v
e
s
tat
e
Perl to
t
ie git comm
a
nd pipe han
d
le
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2007-01-22
Alex Riesen
Ins
e
rt ACTIVEST
A
TE_STRING in Git
.
pm
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2007-01-10
Alex Riesen
Speed
-
up
recursive by flushing index only
o
nce fo
r
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2006-12-13
Alex Riesen
Clarify fetch
err
o
r fo
r
missin
g
o
b
j
ects
.
commit
|
commitdiff
|
tree
2006-12-04
Alex Riesen
Make perl/ b
u
il
d
procedure Active
S
tate fr
i
en
d
ly
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2006-11-29
A
lex Riesen
git-blam
e
: fix rev param
e
t
er handli
n
g
.
commit
|
commitdiff
|
tree
2006-11-06
Alex Riesen
merge-recursive implicitely dep
e
nds on tr
u
st_executable
_
bit
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2006-09-29
A
lex Riesen
do no
t
discard c
o
nstnes
s
in interp_set_
e
ntry value
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2006-09-29
Ale
x
Riesen
fi
x
d
a
emon
.
c c
o
m
p
ilation for NO_IPV6=1
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2006-09-26
Ale
x
R
i
esen
Use co
n
st for interpolate
a
rgum
e
nts
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2006-07-25
Alex Riesen
Trivi
a
l path op
t
imization tes
t
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2006-07-14
Alex Riesen
Do not use perl
i
n git-commi
t
.
sh
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2006-05-21
Alex
R
iese
n
remove sup
e
rflous "const
"
commit
|
commitdiff
|
tree
2006-04-23
Alex
Riesen
make update-in
d
ex --chmod w
o
rk with m
u
ltiple files
.
.
.
commit
|
commitdiff
|
tree
2006-03-03
Alex Riese
n
workar
o
und fat/ntfs
d
ef
i
ci
e
ncies for t3600-rm
.
sh (git-rm)
Signed-off-by:
Alex Riesen
<ariesen@harmanbecker.com>
commit
|
commitdiff
|
tree
2006-02-23
Alex R
i
e
s
e
n
PATCH: simp
l
ify calls t
o
git
programs in git-fmt-merg
e
-
m
s
g
commit
|
commitdiff
|
tree
2006-02-23
A
l
ex
Riesen
fix t560
0
-c
l
one-fail
-
clea
n
up
.
sh on
w
i
n
d
ows
commit
|
commitdiff
|
tree
2006-02-12
Alex Riese
n
avoid ech
o
-
e
, t
h
ere are s
y
stems wher
e
it does not
.
.
.
commit
|
commitdiff
|
tree
2006-02-12
Alex
Riesen
fix "test
:
2
: unex
p
ect
e
d operat
o
r" on bs
d
commit
|
commitdiff
|
tree
2006-01-06
Alex Ries
e
n
use GIT_D
I
R in
s
tead of
/
v
a
r/tmp
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2006-01-06
A
l
ex
Riesen
trivi
a
l: c
h
eck, i
f
t/trash di
r
ectory was s
u
c
c
es
s
full
y
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2006-01-06
Alex
R
iese
n
trivial:
.
gitignore
p
re
c
ompiled
p
y
th
o
n modules
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2006-01-06
Al
e
x Riesen
trivial:
use git-repo-config t
o
detect
ho
w
to run tests
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2006-01-06
Alex Riesen
t
r
ivial
:
us
e
g
it-repo-config to detect if
t
he test
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2006-01-06
Alex Riese
n
trivial:
remove the dots at t
h
e end of file names from
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2006-01-06
Ale
x
Riesen
trivial
:
c
larify, what ar
e
the conf
i
g's
us
e
r
.
name and
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2006-01-06
A
l
ex
Ri
e
se
n
trivial: t
y
po
in git-commi
t
.
sh
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2006-01-06
Ale
x
Ries
e
n
use result of o
p
en(2
)
t
o
check for presenc
e
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2006-01-06
Ale
x
Riesen
fix pot
e
ntial d
e
adlo
c
k in create_one_f
i
le
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2006-01-06
Alex Ri
e
sen
t
r
ivial: O_EXCL makes O_TRUNC
r
e
d
undant
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2006-01-06
A
l
e
x Riesen
trivial: retval of wai
t
pid is not errno
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2005-12-22
Alex
Riesen
\n usage in
stderr output
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2005-12-09
Alex Ri
e
sen
use
"gi
t
in
i
t-db" in tests
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2005-12-02
A
l
ex Rie
s
en
git wrapper: mo
r
e
careful argument st
u
f
f
ing
[jc: Originally from
Alex Riesen
with inputs from Sven
commit
|
commitdiff
|
tree
2005-11-29
Alex Riesen
[PATCH] Add te
s
ts for git
-
mv in subd
i
rectorie
s
commit
|
commitdiff
|
tree
2005-11-22
Alex
Ri
e
sen
argume
n
t
s
c
lea
n
up and some formatting
Signed-off-by:
Alex Riesen
<ariesen@harmanbecker.com>
commit
|
commitdiff
|
tree
2005-11-22
A
lex Riesen
re
m
ove
u
nused v
a
riable
Signed-off-by:
Alex Riesen
<ariesen@harmanbecker.com>
commit
|
commitdiff
|
tree
2005-11-22
A
lex R
i
e
s
en
speedup
a
l
l
o
c
ation in
p
ack-r
e
dundant
.
c
Signed-off-by:
Alex Riesen
<ariesen@harmanbecker.com>
commit
|
commitdiff
|
tree
2005-11-15
Alex Riesen
all
o
w
g
it-update-ref create
r
efs with slashes in
names
commit
|
commitdiff
|
tree
2005-11-08
Alex Ries
e
n
make te
s
ts ignorable with "mak
e
-i"
commit
|
commitdiff
|
tree
2005-11-08
Alex
Riesen
fix t5000
-
tar-tree
.
sh when $TAR isn't set
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2005-11-08
A
l
ex
R
iesen
ls-files and read-tree ne
e
d c
o
r
e
.
fi
l
emode
commit
|
commitdiff
|
tree
2005-11-03
Alex R
i
esen
remove CR/LF from
.
gitignor
e
commit
|
commitdiff
|
tree
2005-10-06
Alex
R
iesen
Do not req
u
i
r
e ls-
r
e
m
ote to
be run insid
e
a
g
it rep
o
sitory
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree
2005-10-05
Alex Riesen
[PATCH]
hold_index_f
i
le_f
o
r
_upda
t
e
sho
u
ld
not
unlink
.
.
.
Signed-off-by:
Alex Riesen
<raa.lkml@gmail.com>
commit
|
commitdiff
|
tree