repo.or.cz
/
git
/
gitweb.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
Re
n
e Scha
r
fe
Fold get_merge_bases
_
clean(
)
into
get_merge
_
bases()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-02
R
e
ne
Sc
h
arfe
Make cl
e
ar_comm
i
t
_
marks(
)
c
l
ean harder
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-02
Ren
e
Scharfe
A
dd '
.
.
.
' operator
for revision
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-07-02
Rene Scharfe
Add get
_
m
e
rge_bases_clean()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-29
Johannes
S
c
h
indelin
mo
v
e
get_me
r
ge_
b
ases()
to core
l
ib
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-29
Joh
a
nnes S
c
hindelin
re
f
actor m
e
rge_b
a
ses
(
) as
p
rep
a
r
a
tion to l
i
bif
y
merge
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-29
Juni
o
C Hamano
Merge branch 'jc/repack'
commit
|
commitdiff
|
tree
2006-06-29
Junio C Hamano
Mer
g
e
branch 'js/p
a
tch
'
commit
|
commitdiff
|
tree
2006-06-29
J
unio C Hamano
di
f
f
.
c: f
i
x
get_
p
a
tch_id(
)
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-29
Junio
C
Hamano
t4014: fix test co
m
mit
l
abels
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-29
Junio C Ha
m
ano
checkout -m: fix read-tree invoc
a
t
i
o
n
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Junio C Hamano
t
/
README: start
testing por
c
ela
i
n
ish
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Jo
h
a
nnes Schindel
i
n
Save e
r
rno in handle_alia
s
()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Eric W
o
ng
reba
s
e
:
check for errors
f
r
o
m g
i
t-
c
ommit
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Mar
t
in Langhoff
cvsimpor
t
- c
l
e
anup of the multi-indexes handling
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Junio C Hamano
co
n
nect
.
c: check the co
m
mit buffer boundary wh
i
le parsing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Junio
C
Hamano
c
onnect
.
c: remov
e
unuse
d
p
aram
e
t
ers
fro
m
tcp_connect
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Timo Hirvonen
Make some
strings con
s
t
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
E
r
ic W
o
ng
rebase: get
rid of
ou
t
dated MRESOLVEMSG
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Andrea
s
Ericss
o
n
git
w
ra
p
p
er: fix command name in an error mes
s
a
g
e
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Er
i
c Wong
git-
s
vn: b
e
v
erbose by default on fetch/commit, add
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Eric Wong
git-
s
vn:
a
dd --follow
-
p
a
r
ent and --no-metad
a
t
a
o
p
t
io
n
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
E
r
i
c Wong
git-svn: add the
commit-diff command
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Eric
W
o
ng
git-svn: several graft-
b
ranches im
p
rovements
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
Eric Wong
g
i
t
-
svn:
SVN
1
.
1
.
x
li
b
rary compatib
i
lity
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
J
u
ni
o
C Hamano
combin
e
-
d
iff
.
c:
type sanity
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-28
J
eff
K
ing
quote
.
c: si
l
ence compiler warnings fr
o
m EM
I
T
macro
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-27
Johannes Schi
n
deli
n
for
m
at-patch: use clear_co
m
m
i
t_marks() instead of some
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-27
Denn
i
s S
t
osber
g
F
i
x
ex
p
r us
a
g
e for
F
r
eeBSD
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-27
Johannes Schind
e
lin
t4014: fix for whitespace fr
o
m
"wc
-
l"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
J
u
n
i
o
C Hamano
t4014: add
format-
p
atch --ignore-if-in-upstream test
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Joh
a
nnes
S
chindelin
format-patc
h
: introduce "--ignor
e
-
i
f
-
i
n-u
p
stream"
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
J
o
h
annes Schindelin
add
d
iff_f
l
ush_patch_id() to calcula
t
e th
e
patch
id
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
J
unio C Ha
m
ano
Merge bran
c
h 'jc/s
q
uash'
commit
|
commitdiff
|
tree
2006-06-26
Junio C Haman
o
M
e
rge branch 'jc/diff'
commit
|
commitdiff
|
tree
2006-06-26
Junio
C
Hamano
Merge b
r
anch 'ml/cvsimport'
commit
|
commitdiff
|
tree
2006-06-26
Junio C
H
amano
Merge bran
c
h 'js/diff'
commit
|
commitdiff
|
tree
2006-06-26
Junio C Ha
m
ano
Merge
b
ranch 'ew/r
e
base
'
commit
|
commitdiff
|
tree
2006-06-26
Dennis Stosberg
Fix pkt-line
.
h
t
o
compile w
i
t
h
a non-GCC compiler
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-26
Den
n
i
s Stosberg
So
l
aris needs incl
u
s
ion of signal
.
h fo
r
sig
n
al()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Matt
h
ias Lederh
o
fer
correct
d
o
c
u
m
en
t
ation for
git grep
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
J
unio C Hamano
g
it-repack: Be careful whe
n
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 -
-
colo
r
:
use $GI
T
_DIR/config
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
E
ric
W
ong
rebase: allow -
-
skip to work with --merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
E
ric Wong
rebase: cleanup reba
s
ing with --merge
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Eric Wong
reba
s
e: all
o
w
-
-merge op
t
io
n
to hand
l
e
patches mer
g
ed
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Ya
n
n Dirson
git-com
m
it:
fi
l
ter out log
message lines only when
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Peter Eriksen
Rename sa
f
e_strncpy() to str
l
cpy()
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Joha
n
nes
Schindel
i
n
app
l
y: replace NO_
A
CCURA
T
E_DIFF
w
ith --inaccurate
-
eof
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Timo Hirvonen
C
l
ea
n
up diff
.
c
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-25
Jo
h
annes Schind
e
l
in
cvsimport: always set $ENV{GIT_INDE
X
_FILE} to $
i
ndex
.
.
.
commit
|
commitdiff
|
tree
2006-06-24
Ma
r
t
i
n La
n
gho
f
f
c
vsimport: setu
p
indexes correc
t
ly for ancestors and
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Junio C Ham
a
no
repo-config: fix pr
i
nting
of bo
o
l
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Junio
C Hamano
d
iff --
c
o
lo
r
:
use reset
seq
u
ence w
h
e
n we mean re
s
et
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
M
artin L
a
ngh
o
ff
git-rep
a
ck -- respect -q
a
n
d be
quiet
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Junio C Hamano
git-merg
e
--squ
a
sh
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Junio C Hamano
g
it
-
pull: abort w
h
en fmt-merge-msg fails
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Jun
i
o C Hama
n
o
Merge branch 'pb/error'
commit
|
commitdiff
|
tree
2006-06-24
Junio C Ha
m
ano
usage:
minimum type
f
ix
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Petr Ba
u
dis
Customiza
b
le error handlers
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
T
im
o
Hirv
o
nen
g
it-merge: Don't use -p
w
hen o
u
t
puttin
g
summary
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-24
Joha
n
ne
s
Sc
h
i
nde
l
i
n
Teach
diff about -b and
-
w
f
la
g
s
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-23
Jeff K
i
ng
git-commi
t
: allow
-e o
p
tion anywhere on command
l
i
n
e
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-23
Johannes Sch
i
ndelin
pat
c
h-id: take "comm
i
t" pr
e
f
i
x
as wel
l
as "diff-tree
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
Makefile: do not recomp
i
le main programs
when librarie
s
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Matthias Ke
s
tenh
o
lz
add GIT-C
F
LAGS to
.
g
i
tig
n
ore
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Linus T
o
rval
d
s
Tweak diff colors
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Junio C H
a
m
ano
Me
r
ge branch 'master'
i
nt
o
ne
x
t
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
Merge branch '
j
s
/
lsfix'
commit
|
commitdiff
|
tree
2006-06-22
Jun
i
o C
H
am
a
no
Merge branch 'ew/r
e
base
'
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
Merge branc
h
'jn/web'
commit
|
commitdiff
|
tree
2006-06-22
J
u
n
i
o C Hamano
Merge early parts of bran
c
h 'js/diff'
commit
|
commitdiff
|
tree
2006-06-22
Jun
i
o C Ham
a
no
M
e
rge
bra
n
c
h 'jc/upl
o
ad-
c
o
r
rupt'
commit
|
commitdiff
|
tree
2006-06-22
Junio C Ha
m
ano
Me
r
ge branch
'
ew
/
rebase'
into
n
ext
commit
|
commitdiff
|
tree
2006-06-22
Junio C Haman
o
Merge
branch 'jn/
w
e
b
' into next
commit
|
commitdiff
|
tree
2006-06-22
Jak
u
b Narebski
g
itweb: whitespace cleanup around
'
='
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
T
i
mo Hirv
o
nen
gi
t
we
b
: Use $hash_base
a
s $searc
h
_ha
s
h if pos
s
ible
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Junio
C
Hamano
Merge branch 'jc/waitpid'
commit
|
commitdiff
|
tree
2006-06-22
Junio
C
Hama
n
o
M
e
rge branch 'ff/c99
'
commit
|
commitdiff
|
tree
2006-06-22
Junio C Ham
a
no
Merg
e
branch 'pb/confi
g
'
commit
|
commitdiff
|
tree
2006-06-22
Junio C
Hamano
Merge br
a
nch 'lt/ob
j
list'
commit
|
commitdiff
|
tree
2006-06-22
Eric Wong
git-svn: fix commit --edit flag when usin
g
SVN:: libraries
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
J
unio C Hamano
M
a
k
efile: do not forc
e
unneeded
r
e
compilatio
n
upon
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Junio C
H
a
mano
r
ebase -
-
merge: fix for reba
s
ing more than 7
commits
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Eric W
.
Biederman
Check and document the options
t
o preve
n
t
mistakes
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Y
a
kov Lerner
Pa
s
s -D
D
EFAULT_G
I
T
_
TEMPLATE_DIR
only whe
r
e ac
t
ually
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-22
Junio
C
H
a
mano
Merge br
a
nch
'
master' into next
commit
|
commitdiff
|
tree
2006-06-21
Junio C Hamano
Merge b
r
anch
'j
c
/uplo
a
d
-
corrupt' into
next
commit
|
commitdiff
|
tree
2006-06-21
Junio C Hamano
Merge
b
ranch 'j
n
/web' into next
commit
|
commitdiff
|
tree
2006-06-21
J
u
nio C H
a
m
a
n
o
daemon: send st
d
err to /dev/null
instead of c
l
osing
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Jakub Nar
e
bski
git
w
eb: Make u
s
e
o
f
$PATH_
I
N
FO for project p
a
ram
e
t
e
r
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Linus Torvald
s
Fix grow_refs_hash()
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Junio C Ha
m
ano
Merg
e
branch 'ew/rebase' into nex
t
commit
|
commitdiff
|
tree
2006-06-21
Eri
c
Wong
rebase: e
r
ror
out for
N
O
_PYTH
O
N i
f
they us
e
re
c
ur
s
ive
.
.
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Junio C Hamano
Add r
e
naming-
r
e
b
ase test
.
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Eri
c
Wong
rebase:
All
o
w me
r
ge strategies to be used when reb
a
s
i
ng
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Andre Noll
object-refs: avoid division by zero
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
2006-06-21
Ju
n
i
o
C Hamano
Me
r
ge bra
n
ch 'ff/c99
'
into n
e
x
t
commit
|
commitdiff
|
tree
2006-06-21
J
u
nio C Hama
n
o
Merge b
r
anch 'jc/
u
pload-corrupt' into next
commit
|
commitdiff
|
tree
2006-06-21
Junio
C Hamano
upload-
p
ack/fetch
-
pack: support
s
id
e
-ban
d
co
m
mun
i
cation
Signed-off-by:
Junio C Hamano
<junkio@cox.net>
commit
|
commitdiff
|
tree
next