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
get_merge_bases: clean up even when there is no common commit.
2006-07-03
Junio C
H
amano
get_me
r
g
e
_bases: cl
e
an
u
p even when there is
n
o common
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-02
J
u
nio C
H
ama
n
o
commit
.
c: do
n
ot rede
f
ine UNINTERESTING b
i
t
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-02
Re
n
e
S
charfe
Fold get_merge_
b
ases_cle
a
n() into get_me
r
ge_bases
(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-02
Rene Schar
f
e
Make
clear
_
c
o
m
mit_marks(
)
clean ha
r
d
er
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-02
R
ene Scharfe
Add '
.
.
.
' o
p
erator f
o
r revisi
o
ns
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-02
Re
n
e S
c
har
f
e
Add get_merge_bases_clean()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-29
Johanne
s
Schindelin
mo
v
e g
e
t
_merge_bases
(
)
to core lib
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-29
Jo
h
annes Sc
h
indelin
refactor merge
_
bases() as
preparation to l
i
bify
m
erge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-29
Junio C Hama
n
o
M
erge
branch 'jc/repack'
commit
|
commitdiff
|
tree
2006-06-29
J
unio C Hamano
Merge branch 'js/patch'
commit
|
commitdiff
|
tree
2006-06-29
Junio
C Ham
a
no
dif
f
.
c: fix get_patch_id
(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-29
Junio C Hamano
t4014
:
fix test
commit
l
abels
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-29
Ju
n
io C
Hama
n
o
ch
e
c
kout -m:
f
ix read-tree invocation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Junio
C
Hamano
t
/README:
s
tart testi
n
g porc
e
lainish
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Johannes Schi
n
delin
Save errno in h
a
n
dle
_
alias()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Eric Wong
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 Langho
f
f
cvsimport -
cle
a
nup
o
f t
h
e multi-inde
x
es
h
andling
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
J
un
i
o C Hamano
connect
.
c: check
the
c
ommit buffer boundary
while
parsing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Junio C Hamano
conn
e
ct
.
c: remov
e
unused parameters from tcp_c
o
n
nect
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
T
i
mo
H
irvonen
M
ake s
o
me string
s
co
n
st
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Eric Wong
r
ebase: g
e
t
r
id of out
d
a
t
ed MRESOLVEMSG
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Andreas Ericsso
n
git wr
a
p
p
er: fix command name i
n
an
e
rr
o
r
m
es
s
a
ge
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Eri
c
W
o
ng
git-svn: be verbose
b
y default on fe
t
ch
/
commi
t
, add
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Eric Wong
git-svn
:
add
--follow-parent and
-
-no-me
t
ad
a
t
a options
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Eric Wong
git-svn: a
d
d the commit-di
f
f
c
o
mma
n
d
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Eric Wong
git-svn: several gra
f
t-branches
i
mprovement
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Eric Wong
git-svn: SVN 1
.
1
.
x library c
o
mpa
t
ibility
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Junio
C
Hamano
combine-diff
.
c: type sanity
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Jeff King
qu
o
te
.
c: silenc
e
compiler warnings fro
m
EMIT m
a
cro
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-27
Joh
a
n
ne
s
Sc
h
indelin
format-p
a
tch: use clea
r
_commit_
m
arks()
i
nstead of
s
ome
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-27
Dennis Stosberg
Fix expr usage for Fr
e
eBSD
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-27
Johannes Sch
i
ndelin
t4014: fix
fo
r
whitespace fro
m
"wc -l"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
J
unio C Hamano
t4014: add
f
ormat-patch --ignore-if-in-upstre
a
m test
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
J
oha
n
nes
Schin
d
elin
format-
p
atch: introduce "--ign
o
re
-
if-in-up
s
tream"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Johanne
s
Schindelin
add di
f
f
_flush_patc
h
_
id(
)
t
o calculate the patch id
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
J
unio
C
H
aman
o
Merge
b
ranch 'jc/squash'
commit
|
commitdiff
|
tree
2006-06-26
Junio C Ham
a
no
Merge
branch
'
j
c/diff'
commit
|
commitdiff
|
tree
2006-06-26
Junio C Ham
a
no
M
e
rge
b
ranch
'
ml/cv
s
im
p
ort'
commit
|
commitdiff
|
tree
2006-06-26
Junio
C Hama
n
o
M
e
rge
b
ranch 'js/diff
'
commit
|
commitdiff
|
tree
2006-06-26
J
unio C H
a
mano
Merge branch 'e
w
/reb
a
se'
commit
|
commitdiff
|
tree
2006-06-26
Dennis Stos
b
erg
Fix pkt-line
.
h to compile wit
h
a non-
G
CC c
o
mpile
r
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Dennis St
o
sberg
Solaris n
e
eds incl
u
s
i
on
o
f sign
a
l
.
h for signal()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Matthias
L
ederh
o
f
e
r
correct documentat
i
on fo
r
git grep
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Junio C
H
amano
git-repack: Be careful when updating
the same pack
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Junio C Hama
n
o
diff -
-
col
o
r: use $GIT_
D
I
R
/config
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Eric Wong
rebase: allo
w
--skip to work with --merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Eric Wong
reba
s
e
:
clean
u
p
r
ebasing with
-
-merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
E
r
ic Wong
rebas
e
: al
l
ow --merge option to handle patches merged
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Yann Dirson
git-commit: filte
r
o
u
t log mes
s
age li
n
e
s
only when
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Peter Eriksen
Rename safe_s
t
rncp
y
() t
o
s
trlcpy()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Johannes Schin
d
elin
a
p
ply
:
re
p
lace NO_A
C
CUR
A
T
E
_DI
F
F wi
t
h
-
-inaccurate-eof
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Timo
H
irvonen
C
lean u
p
d
i
f
f
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Johann
e
s Schindelin
cvsim
p
ort: a
l
w
ays set $ENV{GI
T
_I
N
DEX_FILE
}
to $index
.
.
.
commit
|
commitdiff
|
tree
2006-06-24
Marti
n
L
a
nghoff
cvsimp
o
r
t
:
setup ind
e
xes co
r
rectly f
o
r ance
s
tors and
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Junio
C
Ha
m
ano
repo-confi
g
:
f
ix printing
of
bool
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Junio C
Hamano
diff --color: use reset sequen
c
e w
h
en we mean re
s
et
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Martin Langhof
f
g
i
t-repack -- respec
t
-q
and be q
u
iet
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Ju
n
io C Hama
n
o
g
i
t
-
merge --squash
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Junio C Hamano
g
i
t-pull
:
a
bort when
f
m
t
-merge-msg
f
ails
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Junio C
H
amano
Merge
b
ranch
'pb/
e
rro
r
'
commit
|
commitdiff
|
tree
2006-06-24
J
u
ni
o
C Hamano
usage
:
m
i
nimum t
y
pe fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Petr Baudis
C
usto
m
izable err
o
r han
d
lers
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Timo Hirvon
e
n
git-
m
erge:
D
on't use -p
when o
u
t
p
utting summary
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
J
o
hannes Schindelin
T
each diff about -b
and -w fl
a
gs
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-23
J
e
ff King
git-commit: allow -e opt
i
on anywhere on command line
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-23
Johannes
S
ch
i
nd
e
lin
patch-id: take "commit" prefix as
well as "di
f
f
-
t
re
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
Makefile: do not
re
c
ompile main programs whe
n
librari
e
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Matthi
a
s Kestenholz
add GIT-CFLAGS to
.
gitigno
r
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Li
n
us T
o
rvalds
Tweak diff co
l
o
r
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hama
n
o
Merge branch '
m
as
t
er' into next
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
Merge branch 'js/lsfix'
commit
|
commitdiff
|
tree
2006-06-22
J
unio C Hama
n
o
Merg
e
branch '
e
w/rebase'
commit
|
commitdiff
|
tree
2006-06-22
Ju
n
io C Ha
m
ano
Merge br
a
nch
'
jn
/
web'
commit
|
commitdiff
|
tree
2006-06-22
Junio
C
Hamano
Merge early parts of
br
a
nch 'js/diff'
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
M
e
rge branch 'jc/uplo
a
d-corrupt'
commit
|
commitdiff
|
tree
2006-06-22
J
u
n
i
o C
H
amano
Merge branch 'ew/
r
ebase'
into next
commit
|
commitdiff
|
tree
2006-06-22
Juni
o
C Hamano
Merge branch 'jn/web
'
into ne
x
t
commit
|
commitdiff
|
tree
2006-06-22
J
a
kub
Narebsk
i
g
i
tweb: w
h
itespace cleanup
around
'=
'
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Timo Hirvonen
gitweb: Use
$
h
a
sh_base
as $sear
c
h
_
hash if possibl
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Ju
n
io C Ham
a
no
Merge branch 'jc/waitp
i
d
'
commit
|
commitdiff
|
tree
2006-06-22
Junio
C Hamano
Merge
b
ranch 'ff/
c
99'
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
Merge branch
'
pb/config'
commit
|
commitdiff
|
tree
2006-06-22
Ju
n
io C H
a
mano
Me
r
ge
branch 'lt/objlist'
commit
|
commitdiff
|
tree
2006-06-22
E
r
ic Wong
gi
t
-s
v
n:
fix c
o
m
m
it
--ed
i
t flag when using SVN:: libra
r
ies
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
Makefile
:
do not force unneeded recompilation upon
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
J
u
nio C Hamano
rebase --merge: fix for rebasing mor
e
tha
n
7
commits
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Eric W
.
Biederma
n
Check and
d
ocument t
h
e options to prevent mistakes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Y
akov Lerner
P
a
ss -DDEFAULT_GIT_TEMP
L
AT
E
_DIR only
w
here
a
ctually
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hama
n
o
M
erge branch 'master' into next
commit
|
commitdiff
|
tree
2006-06-21
Juni
o
C
Hamano
Merge branch '
j
c/up
l
oad-corru
p
t'
int
o
nex
t
commit
|
commitdiff
|
tree
2006-06-21
Junio
C
Hamano
Merge branch 'jn/we
b
' int
o
n
e
xt
commit
|
commitdiff
|
tree
2006-06-21
Junio C
H
am
a
no
daemon
:
send stderr
t
o /de
v
/
null in
s
tead
o
f closing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Jakub Narebski
gitweb: Make use of $PATH_INFO for p
r
oject parameter
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Linus Torval
d
s
Fi
x
grow_refs_hash
(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Ju
n
io C Hama
n
o
Merg
e
branch 'ew/reb
a
se' into n
e
xt
commit
|
commitdiff
|
tree
2006-06-21
Eric
W
on
g
rebase: error out for NO_PYTHON if they
u
se
r
ecursive
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
J
u
ni
o
C
H
a
mano
Add renaming
-
rebase test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Eric W
o
ng
rebas
e
: A
l
l
ow merge strategies
to be used
whe
n
rebasing
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Andre
Noll
object-refs:
a
v
o
id division by
z
e
ro
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Junio C Hamano
Merge branch 'ff/c99' into nex
t
commit
|
commitdiff
|
tree
next