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
Add get_merge_bases_clean()
2006-07-02
Ren
e
Scharfe
Add ge
t
_
merg
e
_base
s
_
c
lean
(
)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-29
Johan
n
es Sch
i
n
d
e
lin
move get_mer
g
e_base
s
(
) t
o
core li
b
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-29
J
o
h
a
n
n
es Schindelin
refactor merge_bases() as preparation to libify merge
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-29
Junio C H
a
man
o
Merge
b
ranch 'jc/repack'
commit
|
commitdiff
|
tree
2006-06-29
Junio C
Hamano
Merge branch 'j
s
/patch'
commit
|
commitdiff
|
tree
2006-06-29
J
u
nio
C Hamano
di
f
f
.
c
:
fix get_patch_id
(
)
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-29
Junio C H
a
mano
t4014:
fix tes
t
co
m
mit
l
abels
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-29
Junio C Ham
a
no
ch
e
ckout -m: fix re
a
d-tree invocation
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-28
Junio C Hamano
t/README: start testing
p
orc
e
l
ainish
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-28
Johannes Schindelin
S
a
ve errn
o
in handle_alias()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-28
Eric Wong
r
e
base: check for errors fro
m
git-commit
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-28
Martin Langhoff
c
v
s
i
m
p
ort - clea
n
up
o
f the mult
i
-indexes handling
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-28
Junio C Hamano
conn
e
ct
.
c: check the
c
omm
i
t bu
f
f
e
r
boundary
w
hile parsing
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-28
J
unio C H
a
mano
connect
.
c: remov
e
unused parameters f
r
om tcp_co
n
nect
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-28
Timo Hirv
o
n
en
M
a
ke some
st
r
ings const
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-28
Eri
c
W
ong
r
e
base: get rid of outdated MRE
S
OLVEMSG
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-28
A
n
dreas Eric
s
son
gi
t
wrapper: fix
command
n
ame in an error message
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-28
Eric Wo
n
g
git-svn: be
v
erbose by default on fetch/commit, add
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-28
Eric
W
ong
git-svn: add
--follow-parent and --no-me
t
a
d
a
ta
o
ptions
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-28
E
r
ic Wo
n
g
git-svn:
a
d
d the c
o
mmit-d
i
ff command
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-28
Eric Wong
g
i
t-svn: s
e
veral gra
f
t-branches improvements
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-28
Eric Wo
n
g
git-svn: SVN 1
.
1
.
x
lib
r
ary compatibility
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-28
J
unio C Hamano
c
ombine-diff
.
c
:
t
ype sanity
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-28
Je
f
f
King
quote
.
c:
s
i
l
enc
e
compi
l
er w
a
rn
i
ngs
f
r
o
m EMIT ma
c
ro
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-27
Johannes Schindelin
fo
r
mat-patch
:
use clear_
c
ommit_ma
r
ks() instead
o
f some
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-27
Dennis Stosber
g
Fix exp
r
u
sage for FreeB
S
D
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-27
Johannes
Schinde
l
in
t
4
014: fix
f
or w
h
i
t
esp
a
ce
from "wc
-
l"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-26
Junio
C Ha
m
ano
t401
4
:
add format-patch
--ignore-i
f
-in-upstream test
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-26
J
o
hannes Schi
n
del
i
n
form
a
t-patch: i
n
troduce
"--ignore-if-in-u
p
stream"
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-26
J
oh
a
nnes Schindelin
a
dd
d
if
f
_fl
u
sh_patc
h
_id() to calculate the
p
a
t
ch id
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-26
Junio C H
a
m
a
no
Merge branch 'jc/s
q
uash'
commit
|
commitdiff
|
tree
2006-06-26
Junio
C
Hamano
M
erge branch
'jc/diff
'
commit
|
commitdiff
|
tree
2006-06-26
Junio C Hamano
Merge
b
ranch
'
ml/cvsimport'
commit
|
commitdiff
|
tree
2006-06-26
J
unio C Hamano
M
e
rge
b
ranch '
j
s/diff'
commit
|
commitdiff
|
tree
2006-06-26
J
unio C Hamano
Merge
branch 'ew/rebase'
commit
|
commitdiff
|
tree
2006-06-26
Denn
i
s
Stos
b
erg
Fix pkt-line
.
h to compile
with a non-
G
CC comp
i
ler
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-26
Dennis Stosberg
S
o
laris needs inclusion o
f
si
g
nal
.
h for signal()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-25
M
a
t
thias Lederho
f
er
c
orrec
t
docu
m
ent
a
t
ion for git
g
re
p
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-25
Junio
C
H
a
m
ano
git-
r
epa
c
k
:
B
e
careful whe
n
updatin
g
the same
pa
c
k
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-25
Junio C Hamano
diff --color: use
$
GIT_DIR/config
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-25
Eric Wo
n
g
r
e
base:
a
llo
w
--skip to work w
i
th
--merge
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-25
E
ric Won
g
rebase:
c
lea
n
u
p
rebasing w
i
th --merge
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-25
Eric Wong
reb
a
se: allow
-
-merge option to handle patche
s
merged
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-25
Yann
Dir
s
on
gi
t
-
c
om
m
it: filt
e
r o
u
t log message lin
e
s
onl
y
when
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-25
Peter Eriksen
Rename safe_strncpy() to strlcpy
(
)
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-25
Johannes S
c
h
indelin
apply: repl
a
ce NO_A
C
CURAT
E
_DIF
F
with -
-
inac
c
urate-eof
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-25
Timo Hirvonen
Clean
up d
i
ff
.
c
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-25
Joh
a
nnes
S
chindelin
cvsi
m
port: al
w
a
ys set
$ENV{GI
T
_
I
NDEX_FILE
}
to $
i
n
dex
.
.
.
commit
|
commitdiff
|
tree
2006-06-24
Martin
L
a
ngh
o
f
f
cvsimport: s
e
tup
i
ndexes correctly for a
n
cestors and
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-24
Junio
C H
a
ma
n
o
re
p
o-config:
fix p
r
intin
g
of
bool
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-24
Ju
n
io C H
a
mano
d
i
ff --color: use r
e
se
t
se
q
ue
n
ce when we mean
reset
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-24
Martin
L
anghoff
g
it-r
e
p
a
ck --
res
p
ect -q and be
quiet
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-24
Junio C
Ham
a
no
git-merge --squash
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-24
J
u
ni
o
C
Hamano
g
i
t
-pul
l
: abort w
h
en fmt-merge-
m
s
g
fails
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-24
Junio
C Hamano
Merge branch
'pb/error'
commit
|
commitdiff
|
tree
2006-06-24
Junio C
Hamano
usag
e
: minimum type f
i
x
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-24
Petr Baudis
C
u
s
tomiz
a
ble error handlers
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-24
Timo Hirv
o
nen
git-merge: Don't us
e
-p when outpu
t
t
i
n
g
summar
y
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-24
Johannes
S
chindeli
n
Tea
c
h
diff about -b and
-
w flags
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-23
Jeff King
g
i
t-commit: all
o
w -e o
p
tio
n
anywhere on command
l
ine
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-23
Johannes Sc
h
inde
l
in
patch-id: take "
c
ommit" prefix as well
as "diff-tre
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-22
J
u
nio
C
Hamano
Makefile: do not rec
o
mpile main progra
m
s when li
b
ra
r
ies
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-22
Matthias Kestenh
o
l
z
ad
d
G
IT-CFLA
G
S to
.
gitignore
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-22
Linus
T
or
v
alds
Tweak diff color
s
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-22
Juni
o
C Hama
n
o
Merge
branch 'master'
into next
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
Mer
g
e branch 'js/lsfix'
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
Merge bra
n
ch 'ew/rebase'
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hamano
Merge
br
a
nch 'jn/web'
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hama
n
o
Merge
e
a
rly parts o
f
branch 'j
s
/d
i
ff
'
commit
|
commitdiff
|
tree
2006-06-22
Juni
o
C Hamano
Me
r
ge branch 'jc/
u
plo
a
d-corrupt'
commit
|
commitdiff
|
tree
2006-06-22
J
unio C Ham
a
no
Merg
e
branch 'ew/
r
ebase' int
o
nex
t
commit
|
commitdiff
|
tree
2006-06-22
Ju
n
io C H
a
ma
n
o
Merg
e
bra
n
ch 'jn/web' in
t
o ne
x
t
commit
|
commitdiff
|
tree
2006-06-22
J
akub Narebski
gitweb: whitespace cleanup arou
n
d '='
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-22
T
imo
H
i
rvonen
gitweb
:
Use $has
h
_
base as $s
e
a
r
ch_hash
i
f
po
s
si
b
le
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-22
Jun
i
o C Ha
m
a
no
Merge branch 'jc/waitpid'
commit
|
commitdiff
|
tree
2006-06-22
J
u
nio C Hamano
M
erge branch 'ff/c99'
commit
|
commitdiff
|
tree
2006-06-22
Junio C Hama
n
o
Merge
branch 'p
b
/co
n
fig
'
commit
|
commitdiff
|
tree
2006-06-22
Ju
n
io C
H
aman
o
Merge bran
c
h 'l
t
/obj
l
is
t
'
commit
|
commitdiff
|
tree
2006-06-22
Eric
W
ong
g
i
t-svn: fix co
m
m
it --e
d
it flag when
u
sing SV
N
:: libr
a
ries
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-22
Jun
i
o C Hamano
Ma
k
efile: do not forc
e
unn
e
eded
r
ecompi
l
at
i
on upon
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-22
Junio C Haman
o
rebase --merge: fix
f
o
r
rebasing more than 7 c
o
mmits
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-22
Eric W
.
Bied
e
r
man
Che
c
k
a
n
d
d
ocument
t
he op
t
ions t
o
pr
e
vent
mistakes
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-22
Yakov Le
r
n
e
r
Pass -DDEFAULT_GI
T
_TEMPLATE_DIR only where act
u
ally
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-22
Junio
C
Hamano
Merge bran
c
h 'mas
t
er' into
n
ex
t
commit
|
commitdiff
|
tree
2006-06-21
Junio C Hamano
M
e
rge br
a
nch
'
j
c
/upload-corru
p
t
' i
n
t
o
ne
x
t
commit
|
commitdiff
|
tree
2006-06-21
Junio C
Hamano
Mer
g
e
branch
'
jn/web'
into next
commit
|
commitdiff
|
tree
2006-06-21
J
un
i
o C Hamano
daemon:
s
end stder
r
to /dev/null ins
t
ead of closin
g
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-21
Jakub Narebsk
i
gitweb: Make use of $PATH_IN
F
O for
p
roject pa
r
amet
e
r
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-21
Linus Torv
a
lds
Fix
g
r
o
w_refs_hash()
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-21
J
u
ni
o
C Hama
n
o
Merge
br
a
n
ch
'
ew/rebase' into ne
x
t
commit
|
commitdiff
|
tree
2006-06-21
Eric Wong
rebase:
error out
for NO
_
P
Y
T
HON if they use recursiv
e
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-21
Junio C
Hamano
Add renami
n
g-rebase test
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-21
Eric Wong
r
ebase: Allow merge strategies to be u
s
ed when rebasing
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-21
And
r
e
N
oll
object-refs:
avo
i
d div
i
s
i
on
by zero
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-21
Junio C Hamano
Merge b
r
anch 'ff/c99' in
t
o next
commit
|
commitdiff
|
tree
2006-06-21
Ju
n
i
o C Hamano
Merge bra
n
ch 'jc/upload-corrupt' int
o
next
commit
|
commitdiff
|
tree
2006-06-21
J
u
n
i
o
C Hamano
upload-p
a
ck/fetch-pack: support
s
i
d
e-
b
and communication
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-21
Junio
C Hamano
Retire gi
t
-clone-pack
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-21
Ju
n
io C
H
a
m
ano
u
p
l
oad-pack: pr
e
pare for sideband
m
essage su
p
port
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
2006-06-21
Juni
o
C Hamano
upl
o
ad-pac
k
: a
v
oid se
n
ding an incomp
l
ete p
a
ck
u
pon
.
.
.
Signed-off-by: Junio C Hamano <
junkio@cox.net
>
commit
|
commitdiff
|
tree
next