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
Merge branch 'en/d-f-conflict-fix'
2010-09-08
Junio C Haman
o
Merge bra
n
c
h 'en/d-f-c
o
nfl
i
c
t
-fix'
commit
|
commitdiff
|
tree
2010-09-08
Joh
a
nnes S
i
xt
fa
s
t-export:
e
nsure that
a
re
n
am
e
d file is pri
n
ted
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-07
Junio C Hamano
Mer
g
e br
a
nch 'maint'
commit
|
commitdiff
|
tree
2010-09-07
Elijah N
e
wren
revert:
F
i
x
t
r
i
vial co
m
ment style issue
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-07
Elijah Newren
cache_tree_free:
Fix
s
mall m
e
mory leak
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-06
J
unio
C Hamano
Merge bran
c
h 'jh/clean-ex
c
lu
d
e'
commit
|
commitdiff
|
tree
2010-09-06
Thiago Farina
builtin/clean
.
c: Use STRING_LIS
T
_IN
I
T_NODUP
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-06
Jens Lehma
n
n
t3404 & t75
0
8
:
cd inside subshell inst
e
ad
o
f a
r
oun
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-06
Junio C Hamano
Merge b
r
anch
'
maint'
commit
|
commitdiff
|
tree
2010-09-06
Jun
i
o C Haman
o
Merge
b
ranch
'
xx/trivial' i
n
to mai
n
t
commit
|
commitdiff
|
tree
2010-09-06
Junio C Ha
m
ano
tag
.
c: whitespace breakages fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-06
Jared Han
c
e
Fix w
h
itespace issu
e
in object
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-06
Jen
s
Lehmann
t
55
0
5: add m
i
ssing &&
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-04
J
unio
C
Hamano
Mer
g
e branch 'jl/submodule
-
ignore-diff'
commit
|
commitdiff
|
tree
2010-09-04
Junio C H
a
mano
Mer
g
e
branc
h
'ab/tes
t
-
2'
commit
|
commitdiff
|
tree
2010-09-04
Junio C Hamano
Merge
b
r
anch '
j
s/detached-stas
h
'
commit
|
commitdiff
|
tree
2010-09-04
Jun
i
o C Hama
n
o
Merge branch 'js/main
t
-reflog-beyond-horizon'
commit
|
commitdiff
|
tree
2010-09-04
Junio
C H
a
mano
Merge
b
ranch 'dg/local-m
o
d-error-
m
essages'
commit
|
commitdiff
|
tree
2010-09-04
Junio C Hamano
Merge branch 'nd/ma
i
n
t-fix-replace'
commit
|
commitdiff
|
tree
2010-09-04
N
g
uyễn T
h
ái
Ngọc Duy
p
a
rs
e
_obje
c
t
: pass on the original sha1, not the
replaced one
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-03
Junio C Hamano
Merge
bran
c
h
'ab/compat-r
e
gex'
commit
|
commitdiff
|
tree
2010-09-03
J
uni
o
C
H
a
mano
Merge bran
c
h 'nd/clone-dept
h
-z
e
ro
'
commit
|
commitdiff
|
tree
2010-09-03
Junio
C
Hamano
M
erg
e
bra
n
ch 'jn/maint-doc-
u
ser
-
manua
l
-h
t
ml-doctype'
commit
|
commitdiff
|
tree
2010-09-03
Junio C Hamano
Merge branch 'cb/maint-mergetool
-
no-tty'
commit
|
commitdiff
|
tree
2010-09-03
J
u
nio C Ham
a
no
Merge branch
'
jn/apply-filename-with-sp'
commit
|
commitdiff
|
tree
2010-09-03
J
unio C Hamano
Merge branch 'jn/merge-custom-n
o
-triv
i
al'
commit
|
commitdiff
|
tree
2010-09-03
Jun
i
o C Hamano
Merge b
r
a
nch 'jc/maint-doc-em-das
h
'
commit
|
commitdiff
|
tree
2010-09-03
Juni
o
C Ha
m
ano
Merge branch
'
mg/do
c
-bun
d
le'
commit
|
commitdiff
|
tree
2010-09-03
Ju
n
i
o
C Haman
o
Merge branch 'jn/do
c
-back
s
lash'
commit
|
commitdiff
|
tree
2010-09-03
Junio
C Hamano
Merge bra
n
ch 'jn/update
-
contrib-
e
xample-merg
e
'
commit
|
commitdiff
|
tree
2010-09-03
J
u
nio C Hamano
M
e
r
ge branch 'jn/merg
e
-renorma
l
ize'
commit
|
commitdiff
|
tree
2010-09-03
Junio C Ha
m
ano
Sync with 1
.
7
.
2
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-03
Ju
n
io C Hamano
Git 1
.
7
.
2
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-03
T
h
i
ago Farina
b
uilt
i
n/
m
erge
_
re
c
urs
i
ve
.
c
: Add an usa
g
e string and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-03
J
ens Lehmann
t740
6
& t74
0
7: add missing && at end of
lines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-03
Jen
s
Leh
m
ann
t7405: cd i
n
side
s
ubs
h
ell instead of around
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-03
Matthi
e
u Moy
t7609-merge-co-error-msgs: test non-fast forward case
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-03
Matthi
e
u Moy
Move "
s
how_all_er
r
ors = 1" to setup_unpack_trees
_
porcelain(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-03
Matthieu Moy
set
u
p_unpac
k
_
t
rees_por
c
elain: take
t
he whole
option
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-03
Matthieu Moy
Move
set_porce
l
ain
_
error_msgs to u
n
pack-tr
e
es
.
c
and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-01
Junio
C
Hamano
P
r
epare for
1
.
7
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-01
Junio C Hamano
M
e
r
g
e branch 'maint'
commit
|
commitdiff
|
tree
2010-09-01
Ju
n
i
o
C H
a
mano
Prepar
e
f
o
r 1
.
7
.
2
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-01
Juni
o
C H
a
m
ano
Merge
branch 'gp/
p
ack-refs-rem
o
v
e-empty-dir
s
' into
.
.
.
commit
|
commitdiff
|
tree
2010-09-01
Junio C Ham
a
no
Merge
branch '
s
g/rerere-
g
c
-
o
ld
-
s
t
ill-used'
i
nto maint
commit
|
commitdiff
|
tree
2010-09-01
J
u
nio C Ham
a
no
M
e
rg
e
branch 'np/
m
aint-hu
g
e-delta-generation
'
into
.
.
.
commit
|
commitdiff
|
tree
2010-09-01
Juni
o
C
H
am
a
no
M
e
r
ge branch 'dj/fetch-tagopt
'
i
n
to
maint
commit
|
commitdiff
|
tree
2010-09-01
Ju
n
i
o
C Hamano
M
e
rge branch 'da/f
i
x-submod
u
l
e
-sync
-
su
p
erproject-config
.
.
.
commit
|
commitdiff
|
tree
2010-09-01
Ju
n
io
C Hamano
Merge b
r
anch
'
en/re
b
ase-
a
gainst-reb
a
se-fix' in
t
o maint
commit
|
commitdiff
|
tree
2010-09-01
J
u
nio C
Hamano
install-webdoc: filte
r
timestamp-on
l
y changes cor
r
ectly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-31
Junio
C
H
amano
Merg
e
branch 'np/ma
i
nt-huge-
d
el
t
a-generation
'
commit
|
commitdiff
|
tree
2010-08-31
J
u
nio C
H
am
a
no
Merge branch 'da/f
i
x-submodule-sync-superproject-con
f
ig'
commit
|
commitdiff
|
tree
2010-08-31
Junio
C
Hamano
Merge branch 'jn/cher
r
y
-
revert-
m
e
s
sa
g
e-clean-up'
commit
|
commitdiff
|
tree
2010-08-31
J
unio
C
H
a
mano
Merge branch
'cb/binary-
p
atch-id'
commit
|
commitdiff
|
tree
2010-08-31
Juni
o
C
Ha
m
ano
Merg
e
branch
'
ab
/
mai
n
t-res
e
t
-mi
x
ed-w-pa
t
hspec-ad
v
ice'
commit
|
commitdiff
|
tree
2010-08-31
Juni
o
C Hamano
Merge branch 'dj/fetch-t
a
gopt'
commit
|
commitdiff
|
tree
2010-08-31
J
u
nio
C Ham
a
no
Merge branch
'
en
/
d
-f-conf
l
ict-fix'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Hamano
Merge branch 'jn/svn-fe'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Ha
m
an
o
Merge branch 'tr/
m
aint-no-un
q
uote-p
l
us'
commit
|
commitdiff
|
tree
2010-08-31
J
u
n
i
o C Hamano
Merge branch 'jn/pagin
a
te-f
i
x'
commit
|
commitdiff
|
tree
2010-08-31
Junio C
Hamano
Merge branc
h
'jn/maint-setup-fix'
commit
|
commitdiff
|
tree
2010-08-31
Juni
o
C Ha
m
a
no
Me
r
ge branch
'
en/fast-ex
p
ort-fix'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Hama
n
o
M
e
rge b
r
anc
h
'
h
v
/auto
s
quash-con
f
ig'
commit
|
commitdiff
|
tree
2010-08-31
Junio
C
Hamano
Merge b
r
anch
'
sg/rerere-gc-o
l
d-st
i
ll-used'
commit
|
commitdiff
|
tree
2010-08-31
M
a
t
t
hieu Moy
test
s
: f
a
c
t
o
r HO
M
E
=$(p
w
d)
i
n
test-lib
.
sh
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-31
Ævar Ar
n
f
jörð Bjarmason
t
e
st-lib
:
us
e
subs
h
ell
instead o
f
cd $ne
w
&&
.
.
&&
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-31
Jonathan Ni
e
der
tests: si
m
plify "missing PR
E
REQ" message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-31
Ævar Arnfjör
ð
Bjarma
s
o
n
t/t0000-basi
c
.
sh:
R
u
n the passing
TODO test
i
n
s
ide
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-31
Æ
var Ar
n
fjörð Bjarmason
test
-
lib:
A
llow overr
i
di
n
g of TEST
_
DIRE
C
TORY
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-31
Ævar Ar
n
fjörð Bj
a
rmas
o
n
t
e
st-lib: Use
"$
G
IT_BUILD_DIR" i
n
s
t
ead of
"$TEST_DIRE
C
TORY
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-31
Ævar Ar
n
fjörð Bjarmason
tes
t
-lib: Use $TEST_DIRECTO
R
Y or $GIT_BUILD_DIR i
n
s
t
ead
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-31
Tho
m
as Ra
s
t
te
s
t: Introduce $G
I
T_BUILD_D
I
R
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-31
Anders
Kaseorg
gitweb: Don'
t
die_
e
rr
o
r in git_tag
a
fter already printin
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-31
Jon Seymour
t3
9
03
:
fi
x
broken test_must_fa
i
l c
a
lls
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-31
Jon
S
eymo
u
r
t1
5
03: fix
b
r
o
ken te
s
t_m
u
st_fail calls
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-30
J
e
ns Lehmann
c
heckout: Use sub
m
o
dule
.
*
.
ignore settings from
.
git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-30
Jens Lehmann
checkout: Add t
e
s
t for diff
.
ignoreSubmodules
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-30
Junio C
H
amano
M
e
rge branch 'mai
n
t
'
commit
|
commitdiff
|
tree
2010-08-30
Juni
o
C Haman
o
M
erge branch 'maint
-
1
.
7
.
1' into m
a
int
commit
|
commitdiff
|
tree
2010-08-30
T
h
iago Farina
objec
t
.
h: A
d
d OBJ
E
CT_AR
R
AY_INIT macro and
mak
e
use
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-30
Matthieu Moy
t0003: add
missing && at end of
l
ines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-26
Ju
n
io
C Hamano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2010-08-26
J
ay Soffian
for-each-ref: fix objectname:short
bug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-26
Johann
e
s Sixt
Fix com
p
at/regex ANSIfi
c
ation on
M
inGW
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-25
Eli
j
ah
N
ewre
n
tree-w
a
lk: Corre
c
t bitrotted comment
a
bout tree_entry()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-25
Jo
h
annes
Schindelin
checkout: respect diff
.
ignoreSu
b
modules setting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-25
Linus Torvalds
F
ix 'git log' e
a
r
l
y p
a
ger startu
p
error
c
a
s
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-24
Jun
i
o C Ha
m
a
no
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2010-08-24
Jon Seym
o
ur
rev
-
p
a
rse: test
s
git rev-pa
r
se --verify master@{n
}
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-24
Jon S
e
y
mour
sh
a
1_n
a
me
.
c
: u
s
e
warning in
preferenc
e
to fprintf(stderr
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-24
J
on Seymour
r
e
v-parse: exit
w
i
t
h non
-
zer
o
s
t
atus if ref@{n
}
is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-24
J
o
nat
h
an Nieder
parse-
o
p
t
ions
:
cl
a
r
i
fy PARSE
_
OPT_NOARG descript
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-24
Jon
a
t
h
a
n Nieder
t3302 (notes): Port to
S
ola
r
is
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-24
Brian Gernhard
t
t7606: Avoid using head as a file n
a
m
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-24
Junio C
Hamano
Work aroun
d
em-d
a
sh handling in new
e
r AsciiDoc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-24
Brian
G
ernha
r
dt
t7610: c
d
i
nside s
u
bshell inste
a
d
of around
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-24
Nguyễn
Thái Ngọc Duy
c
l
o
n
e: warn users
--depth is ignore
d
in loca
l
clones
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-23
Mic
h
ael J
Gruber
git-bundle
.
txt: Clarify rev-
l
ist-args
rest
r
ictions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-23
Michael
J
G
r
u
b
er
git-bundle
.
t
x
t
:
white
s
pace cleanup
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-23
M
ich
a
el J Gruber
g
it-bundle
.
txt: Cleanup
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next