repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Fold get_merge_bases_clean() into get_merge_bases()
2006-07-02
Ren
e
Scharfe
Fold
get_merge_
b
ases_clean() into g
e
t_m
e
rge_bases()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-02
R
e
ne
S
charfe
Make c
l
ear_commit_marks() clean h
a
rde
r
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-02
Rene Sch
a
rfe
Add '
.
.
.
'
o
perator f
o
r re
v
isio
n
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-02
Rene Scharf
e
Add get_m
e
rge_bases_clea
n
(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-29
Johan
n
e
s Schindelin
m
o
ve
get_mer
g
e_ba
s
es() to core lib
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-29
Johannes Sch
i
ndelin
r
e
fa
c
t
o
r
merge_ba
s
es() as preparation to li
b
ify me
r
ge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-29
Junio
C Ha
m
ano
Merge branc
h
'jc/repack'
commit
|
commitdiff
|
tree
2006-06-29
Junio
C Hamano
Me
r
ge branch
'js/pa
t
c
h'
commit
|
commitdiff
|
tree
2006-06-29
J
uni
o
C Hamano
dif
f
.
c: fix
get_
p
atch_id()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-29
J
unio
C Hamano
t
4
014: fix t
e
st commit labels
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-29
J
u
nio C Ha
m
a
n
o
checkout -m
:
fix
read-tree invoc
a
tion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Juni
o
C Hamano
t/READM
E
: start testing porc
e
lainish
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Johanne
s
S
c
hindeli
n
Save errno in handl
e
_al
i
as()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Eri
c
W
o
ng
rebase:
ch
e
ck for errors from git-commit
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Martin Langh
o
ff
cvsimport - cleanu
p
of the multi-in
d
exes handling
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
J
unio C Hamano
connect
.
c: check th
e
c
o
mmit
b
uffer bounda
r
y wh
i
l
e parsing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Junio C Hama
n
o
connect
.
c: remove
u
nused parameters from tcp_co
n
ne
c
t
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
T
imo Hi
r
vo
n
en
Make s
o
me s
t
rings co
n
st
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
E
ric
Wo
n
g
reb
a
s
e: get rid of out
d
ated MRESOLVEMSG
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Andreas
E
r
i
csson
git wrappe
r
:
f
ix command name in an error
message
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Eric Wong
git-svn: be verbose
by
default o
n
fetch/comm
i
t, a
d
d
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Er
i
c
Wong
git-
s
vn: add --foll
o
w
-
pare
n
t and
-
-no-metadata options
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Er
i
c
W
ong
git-svn: a
d
d the commit-diff
command
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Eric Won
g
git-svn: sever
a
l graft-branches
i
mprovement
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
E
r
ic Wong
git
-
svn:
S
VN 1
.
1
.
x
l
ibrary compatibility
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Ju
n
i
o
C
Hamano
c
o
mbine
-
diff
.
c: type sanity
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
J
eff King
quote
.
c:
silence compiler warnings from
EMIT
m
a
cro
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-27
Johannes Schindelin
format-patch: use c
l
ear_c
o
mmit_
m
arks()
i
n
s
tead of s
o
me
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-27
Dennis Stosb
e
rg
Fix expr
u
sage for Fr
e
eBSD
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-27
Johannes Schi
n
d
elin
t
401
4
: fix
f
or whites
p
ace fro
m
"wc -l"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Junio C
Hamano
t4014: add format-
p
atch --igno
r
e-if
-
i
n
-ups
t
ream test
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Johann
e
s Schindelin
format-patch: int
r
oduce "--ignore-if-in-upstream"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
J
o
h
a
nnes Schindel
i
n
add diff_f
l
ush_patch_id()
to
calcu
l
a
te th
e
patch id
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
J
un
i
o
C Hamano
M
e
rge branch 'jc/
s
quas
h
'
commit
|
commitdiff
|
tree
2006-06-26
Juni
o
C Ham
a
no
Merge bra
n
ch 'jc/d
i
ff'
commit
|
commitdiff
|
tree
2006-06-26
Junio C Hama
n
o
Merge br
a
nch 'ml/cvsimport'
commit
|
commitdiff
|
tree
2006-06-26
Junio C Hamano
Merge
b
ranch 'js/diff'
commit
|
commitdiff
|
tree
2006-06-26
Junio C Hamano
M
e
rge
b
ranch 'ew/re
b
a
s
e'
commit
|
commitdiff
|
tree
2006-06-26
Den
n
i
s
Stosberg
Fix pk
t
-line
.
h
to
c
ompile with a
non-GCC compiler
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Dennis Stosberg
Solaris needs inclusion o
f
signal
.
h for signal(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Matthi
a
s L
e
derhofer
co
r
rect documenta
t
ion for gi
t
grep
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Junio C Hamano
g
i
t
-repack:
B
e careful wh
e
n upd
a
t
i
n
g
t
he same pack
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
J
u
n
i
o C
H
a
m
ano
diff --color: use
$
GIT_DI
R
/
c
o
n
fig
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Eric Wong
rebase:
a
llow --skip
t
o work with --merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Eric Wong
rebase: cleanup rebasing with -
-
merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
E
r
i
c Wong
rebas
e
:
allow --
m
e
rge option to handle patche
s
merged
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Yann Dirson
git-c
o
mm
i
t: fil
t
er out l
o
g
m
essa
g
e li
n
es onl
y
w
hen
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Peter Erik
s
en
Rename
s
a
fe_st
r
ncpy() to strlcpy()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Johannes Schindelin
a
p
ply:
replace NO_ACCURATE_DIFF with
--inac
c
urate-eof
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Timo Hirvonen
Clean up diff
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Johannes Schi
n
delin
cvsimport: a
l
ways set $ENV{GI
T
_IN
D
EX_FILE} to
$index
.
.
.
commit
|
commitdiff
|
tree
2006-06-24
Marti
n
Langhoff
cvs
i
mp
o
r
t:
s
etup ind
e
xes corre
c
tl
y
for ances
t
ors and
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Junio C Hamano
repo-config: fix printing of bool
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Junio C Haman
o
diff --co
l
or:
u
se reset sequence
when we mean reset
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Martin Lang
h
off
git-repack -- respect -q
a
nd be quiet
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Jun
i
o
C
Ha
m
a
n
o
git-merge
--squash
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Junio C
H
a
mano
g
it-pull: abort when fmt-
m
erge-ms
g
fails
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Junio C Haman
o
Merge
branch 'pb/er
r
or'
commit
|
commitdiff
|
tree
2006-06-24
Junio C Haman
o
usage: mini
m
um type fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Petr Baudis
C
u
stomizab
l
e error handlers
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Tim
o
Hirvonen
git-merge: Don't use -p
w
h
e
n
outputting summary
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Johann
e
s Schindelin
Teach
d
iff about
-
b and -w flags
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-23
Jeff King
git-commit: allow
-
e option anywhere
o
n
c
omman
d
line
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-23
Johannes Schindelin
patch-id: take "commi
t
"
p
r
ef
i
x as well
a
s "diff-t
r
ee
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Jun
i
o
C
H
a
m
a
n
o
Ma
k
efile: do n
o
t recomp
i
le main programs
w
hen
l
ibraries
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Mat
t
hias
Kestenholz
add GIT-CFLAGS
t
o
.
gitignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Li
n
us Torvalds
Tweak diff colors
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Junio C Ha
m
ano
Merge branch
'm
a
ster' into next
commit
|
commitdiff
|
tree
2006-06-22
Junio
C Ha
m
ano
Merge branch 'js/lsfix'
commit
|
commitdiff
|
tree
2006-06-22
Ju
n
io C Hamano
Me
r
ge branch 'ew/rebase'
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
Merge b
r
anch 'jn/
w
e
b
'
commit
|
commitdiff
|
tree
2006-06-22
J
unio C Hamano
M
e
rge earl
y
parts of bran
c
h
'
j
s
/dif
f
'
commit
|
commitdiff
|
tree
2006-06-22
Jun
i
o
C Ha
m
ano
Merge branch 'jc/upload-cor
r
upt'
commit
|
commitdiff
|
tree
2006-06-22
Ju
n
i
o C Ha
m
ano
Merge branch 'ew/reba
s
e' into next
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
Merge bran
c
h 'jn/web' into n
e
xt
commit
|
commitdiff
|
tree
2006-06-22
Jaku
b
N
are
b
ski
gitweb: whit
e
space clean
u
p
around
'='
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Timo Hirvonen
g
i
twe
b
: Use $hash_base
as
$
search_hash if possible
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
M
e
r
g
e b
r
anc
h
'jc/
w
aitpid'
commit
|
commitdiff
|
tree
2006-06-22
Junio C
H
amano
Merge branch 'ff
/
c99'
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
M
erge branch 'pb/con
f
ig'
commit
|
commitdiff
|
tree
2006-06-22
Ju
n
io
C
Ham
a
no
Merge bra
n
ch 'lt/obj
l
ist'
commit
|
commitdiff
|
tree
2006-06-22
Eric
W
on
g
git-svn: fix commit --edit
f
lag when us
i
ng SVN
:
: l
i
bra
r
ie
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Jun
i
o C
Haman
o
Ma
k
efi
l
e: do not fo
r
ce unneeded recompilatio
n
up
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
reb
a
se --merge: fix for rebasin
g
more than 7 co
m
mits
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Eric W
.
Biederman
Check and document the options to
prev
e
nt
mista
k
es
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Yakov Lern
e
r
P
ass -DDEFAULT_GI
T
_TEMPLATE_DIR only wher
e
actuall
y
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Jun
i
o C Hamano
Merge br
a
n
ch
'
m
aster' into ne
x
t
commit
|
commitdiff
|
tree
2006-06-21
Junio C Hamano
Merge
b
ranch 'jc
/
upl
o
ad-corrupt' into next
commit
|
commitdiff
|
tree
2006-06-21
J
unio C Ham
a
no
M
e
rge branch
'
jn/we
b
' into n
e
xt
commit
|
commitdiff
|
tree
2006-06-21
Junio C
H
amano
d
aemon: s
e
nd stderr to /
d
e
v/n
u
ll inst
e
ad of c
l
osing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Jakub
N
arebski
gitweb: Make use of
$
PA
T
H_INFO
f
or
p
roject
p
arameter
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Li
n
u
s
Torvalds
Fix grow_
r
efs_hash()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Ju
n
io C
Ha
m
an
o
Merge
branc
h
'ew/r
e
ba
s
e' into next
commit
|
commitdiff
|
tree
2006-06-21
Eric Wong
reb
a
se:
err
o
r out for
NO_PYTHON if the
y
use recursiv
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Ju
n
io C Ha
m
ano
A
dd renami
n
g-rebase tes
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Eric Wo
n
g
reba
s
e: All
o
w me
r
ge strate
g
i
e
s
to be
u
sed when re
b
asing
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Andre Noll
object-refs:
a
void division by zero
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Juni
o
C Hama
n
o
Merge branch 'f
f
/c99' into next
commit
|
commitdiff
|
tree
2006-06-21
J
unio C Hamano
Merge
branch 'j
c
/upload
-
corrupt' into next
commit
|
commitdiff
|
tree
2006-06-21
Junio C H
a
mano
uploa
d
-pack/f
e
tch-p
a
ck
:
support side-band commu
n
icat
i
on
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next