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
Add get_merge_bases_clean()
2006-07-02
Rene Sc
h
a
rfe
Add get_merge_bases_clean()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-29
J
o
hannes Sch
i
n
delin
move ge
t
_merge_bases() to core lib
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-29
Johannes Sch
i
ndelin
refactor mer
g
e_base
s
(
)
as preparation t
o
libify merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-29
Junio C Hamano
Merge branch 'jc/repack'
commit
|
commitdiff
|
tree
2006-06-29
Junio C Hamano
Merge branch
'
js/patch'
commit
|
commitdiff
|
tree
2006-06-29
Jun
i
o C Hamano
d
i
ff
.
c: fix get_patch
_
id()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-29
J
un
i
o C Hamano
t4014: fix
te
s
t commi
t
labels
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-29
Junio
C
Hama
n
o
c
h
eckou
t
-m
:
f
ix
read-tree inv
o
ca
t
ion
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Junio
C Hamano
t/README: star
t
tes
t
ing porcelai
n
ish
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Jo
h
ann
e
s Schindelin
Save
errno in handle_alias()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Eric Wong
rebase: check fo
r
e
r
rors from git-commit
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Martin Langhoff
cvsimport - cleanup of the mul
t
i-indexe
s
handling
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Junio
C
Hamano
connect
.
c: check the
c
ommit buffe
r
boundary
w
hi
l
e parsing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Junio
C
Hamano
con
n
ect
.
c: re
m
ove unused
p
a
r
ameters fr
o
m tcp
_
connect
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Timo Hirvonen
Make some s
t
rings c
o
nst
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
E
ric Wong
rebase: get rid of out
d
ate
d
MRES
O
LVEMSG
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Andreas Ericsson
git wrapper: f
i
x c
o
mmand
name in an error messag
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Eric Wong
g
i
t
-
svn: b
e
verbos
e
by
defaul
t
on
fetch/co
m
m
i
t
, add
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
E
ri
c
Wong
git-svn: add --follow-parent and --no-me
t
a
d
a
t
a op
t
ions
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
E
r
ic
W
ong
gi
t
-svn:
add the com
m
it-
d
i
f
f comm
a
nd
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Er
i
c Wong
git
-
s
vn
:
several graft-
b
ranches improvements
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Er
i
c Wong
git-svn:
S
VN 1
.
1
.
x library compat
i
b
ility
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Jun
i
o C Hamano
combine
-
diff
.
c: typ
e
sanity
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Jeff King
quote
.
c: silence compiler warn
i
ngs from E
M
IT
m
acro
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-27
Johannes Schindelin
f
o
rm
a
t-
p
atch: us
e
clear
_
commit_marks()
i
nstead of some
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-27
Denni
s
Sto
s
berg
F
i
x ex
p
r usage for
FreeBSD
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-27
Johannes Sch
i
ndelin
t4014: fix
for whitespace fr
o
m
"
wc
-l"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Junio C Ha
m
a
n
o
t4014: add format-pat
c
h --ignore-if-in-upstr
e
am t
e
st
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Johannes S
c
hindelin
f
o
rmat-patch: introdu
c
e "
-
-ignore-if-in-
u
pstream"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Johannes Sch
i
ndelin
add diff
_
flush_patch_id() to
calcu
l
ate the patch id
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Junio C Ham
a
no
M
e
rge bra
n
ch 'jc/squ
a
sh'
commit
|
commitdiff
|
tree
2006-06-26
Jun
i
o C Ha
m
ano
Merge branc
h
'jc/diff'
commit
|
commitdiff
|
tree
2006-06-26
J
u
nio C
Ham
a
n
o
Merge b
r
anch 'ml/c
v
s
impor
t
'
commit
|
commitdiff
|
tree
2006-06-26
Junio C Hamano
M
e
rge branch '
j
s/d
i
f
f'
commit
|
commitdiff
|
tree
2006-06-26
Ju
n
io
C Hamano
Merge branch 'ew/reba
s
e
'
commit
|
commitdiff
|
tree
2006-06-26
Den
n
is
Stosberg
Fix p
k
t-line
.
h to com
p
ile with a non-GCC c
o
m
p
il
e
r
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Dennis Stosberg
S
olaris
n
eeds i
n
clus
i
on of sign
a
l
.
h f
o
r signal()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Matthias Lederhofer
correct d
o
cument
a
tion for git
g
r
e
p
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Junio C Hamano
git
-
repack:
Be careful
w
hen
updating the same pack
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Juni
o
C Ha
m
a
n
o
d
i
ff --color: use $GIT_DIR/con
f
ig
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Eric Wong
rebas
e
: allow --skip to work with --
m
erge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Eric Wong
rebase: cl
e
a
n
u
p
r
e
b
asing
w
ith
-
-
me
r
ge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
E
r
ic Wong
rebase: allo
w
-
-
merge opt
i
on to h
a
ndle patches
m
erge
d
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Y
ann Dirso
n
git-
c
ommit: filter
o
u
t
log message lines
o
n
l
y w
h
en
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Pe
t
er Eri
k
sen
Rename safe_
s
t
r
ncpy()
t
o str
l
cpy()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Johannes
S
chindelin
apply: re
p
lace NO_AC
C
UR
A
TE_DIFF with --i
n
accurate-eof
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Tim
o
Hirvon
e
n
Cl
e
an up diff
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
J
ohannes Schindelin
cvs
i
mport: a
l
ways set $ENV{
G
IT_I
N
DEX_FIL
E
} to $index
.
.
.
commit
|
commitdiff
|
tree
2006-06-24
Marti
n
Langho
f
f
cvsimport: setup index
e
s correctly
f
or ancest
o
rs and
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Ju
n
io
C
H
a
mano
re
p
o-
c
onfi
g
: f
i
x pri
n
tin
g
of bool
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Ju
n
io C Hamano
diff
--col
o
r: u
s
e rese
t
seq
u
ence
when we mean
reset
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Ma
r
t
i
n
Langhoff
g
it-repack -- respec
t
-
q and be quiet
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Jun
i
o
C
H
a
ma
n
o
git-merg
e
--squash
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Junio C
Hamano
g
it-pull: abort when f
m
t-merge-msg fails
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Junio C H
a
mano
Merge branch 'pb/erro
r
'
commit
|
commitdiff
|
tree
2006-06-24
Junio C Hamano
us
a
g
e: minimu
m
type fix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Petr Baud
i
s
C
u
stomi
z
able error handlers
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Timo Hirvonen
g
i
t-
m
erge: Don't us
e
-p when out
p
utt
i
ng sum
m
ary
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Johannes Schin
d
elin
Te
a
ch di
f
f ab
o
ut -b a
n
d -w flags
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-23
J
e
ff
K
ing
git-comm
i
t
: allow
-e
option anywhere on
c
omm
a
nd line
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-23
Joh
a
nn
e
s
Schinde
l
i
n
pa
t
ch-id: take "comm
i
t" prefix as well as "diff-tree
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Junio C H
a
mano
Makefil
e
: do not recompile main
p
rograms wh
e
n libraries
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
M
atthi
a
s Kes
t
e
nhol
z
a
d
d
GIT-CFLAGS to
.
g
itignore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
L
i
nus Torvalds
Tweak di
f
f colors
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
Merge branch 'master' i
n
t
o next
commit
|
commitdiff
|
tree
2006-06-22
J
u
n
i
o
C
H
amano
Merge branch
'
j
s/lsfix'
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
Merge bran
c
h 'ew
/
reb
a
se'
commit
|
commitdiff
|
tree
2006-06-22
J
u
nio C Hamano
Mer
g
e
branch 'jn/web
'
commit
|
commitdiff
|
tree
2006-06-22
Junio C
H
amano
Merge early p
a
r
ts of branch 'js/diff'
commit
|
commitdiff
|
tree
2006-06-22
J
u
n
io C Haman
o
Merg
e
branch 'jc/upload-corrupt'
commit
|
commitdiff
|
tree
2006-06-22
Junio
C
Haman
o
Merge
b
ranch 'ew/re
b
ase'
into next
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
Merge branch 'jn/web' int
o
next
commit
|
commitdiff
|
tree
2006-06-22
J
akub Nare
b
ski
git
w
e
b
: whitesp
a
ce cleanup around '='
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Timo Hirv
o
nen
gitweb: Use $
h
ash_base
a
s $search_ha
s
h
i
f p
o
ssible
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
J
unio
C Haman
o
Merge
b
ranch 'j
c
/wai
t
pid'
commit
|
commitdiff
|
tree
2006-06-22
Junio
C
Hamano
Merge br
a
nc
h
'ff/c
9
9
'
commit
|
commitdiff
|
tree
2006-06-22
Ju
n
io C Ha
m
ano
Mer
g
e branc
h
'pb/con
f
ig'
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
M
erge branch 'lt/objlist'
commit
|
commitdiff
|
tree
2006-06-22
Eric Wong
git-svn: fix co
m
mit --edi
t
f
l
ag when using SV
N
:: libraries
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Jun
i
o
C Haman
o
M
akefi
l
e
:
do not fo
r
ce un
n
eed
e
d r
e
compil
a
tion
u
p
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Junio C
H
amano
r
e
base --merge: fix
f
o
r
rebasing more than
7 commits
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Eric W
.
B
i
e
d
erman
Check and docum
e
n
t
the optio
n
s to pr
e
vent
m
istak
e
s
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Yakov Lerner
Pass -
D
DEFAULT_GI
T
_TEMPLATE_DIR only where actu
a
lly
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
J
u
nio C Hamano
M
erge branc
h
'mast
e
r' into next
commit
|
commitdiff
|
tree
2006-06-21
Jun
i
o C Hama
n
o
Merge branch 'jc/upload-corrupt' i
n
to next
commit
|
commitdiff
|
tree
2006-06-21
Junio C Hamano
M
e
r
ge branch 'j
n
/w
e
b' into next
commit
|
commitdiff
|
tree
2006-06-21
Jun
i
o
C Hamano
da
e
mon:
send st
d
e
r
r to /d
e
v/null in
s
te
a
d of closing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Jakub Narebski
gi
t
web: Make use of
$
P
A
TH_INF
O
fo
r
proj
e
ct parameter
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Linus Torvalds
Fix grow_refs_hash()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Junio C Hama
n
o
M
e
rge branch
'e
w
/reba
s
e
' into n
e
xt
commit
|
commitdiff
|
tree
2006-06-21
E
ri
c
Won
g
rebase: er
r
or out for NO_PYTH
O
N if they use
recu
r
s
i
v
e
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Junio
C
Haman
o
A
d
d renamin
g
-rebase test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Eric
W
o
n
g
rebase
:
Allow merge st
r
ategies
t
o be used when
r
eba
s
in
g
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Andre No
l
l
object-ref
s
: avoid
divi
s
ion by
z
ero
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
J
unio C Hamano
Merge branch
'ff/c99' in
t
o nex
t
commit
|
commitdiff
|
tree
2006-06-21
Ju
n
io C Hamano
Merg
e
branch 'jc/upload
-
corr
u
pt'
into
n
ext
commit
|
commitdiff
|
tree
2006-06-21
Junio C H
a
mano
upload-pack
/
fetch-
p
ack: support side-b
a
n
d communication
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Junio C Hamano
Ret
i
re git-clone-pack
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
J
unio C Hamano
up
l
oa
d
-pack: prepare fo
r
side
b
and message support
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Junio C H
a
man
o
up
l
oad
-
p
a
c
k
: avoid s
e
nding
an in
c
omplete p
a
c
k
upon
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next