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
Merge branch 'en/d-f-conflict-fix'
2010-09-08
Junio C
Hamano
Merge br
a
nch 'e
n
/d-f-confli
c
t-fix'
commit
|
commitdiff
|
tree
2010-09-08
Johannes Six
t
fa
s
t
-
export
:
ensure t
h
at a renamed file is printed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-07
Junio C Haman
o
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2010-09-07
Elijah New
r
en
revert: Fi
x
trivial c
o
mment
style issue
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-07
Elij
a
h N
e
wren
c
ache_t
r
ee_f
r
ee: F
i
x small memory leak
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-06
Juni
o
C Haman
o
Merge branch 'jh/cl
e
an-exclud
e
'
commit
|
commitdiff
|
tree
2010-09-06
Thiago Farina
builtin/cl
e
an
.
c:
Use STRING_LIST_IN
I
T_NOD
U
P
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-06
Jen
s
Lehmann
t3404 & t7
5
08: cd insid
e
subshel
l
inst
e
ad of around
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-06
Junio C Hamano
Merge branch 'mai
n
t
'
commit
|
commitdiff
|
tree
2010-09-06
Junio C Hamano
Merge bra
n
ch 'xx/triv
i
al' into maint
commit
|
commitdiff
|
tree
2010-09-06
Junio C
Haman
o
t
ag
.
c: white
s
pace breakages fix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-06
Jared Ha
n
ce
Fix w
h
itesp
a
ce
i
ssu
e
in object
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-06
J
e
n
s
L
e
h
m
a
nn
t
55
0
5: add missing
&
&
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-04
Junio C Hamano
M
erge branch
'jl/submodule-ignore
-
diff'
commit
|
commitdiff
|
tree
2010-09-04
J
unio
C
Hamano
Merge bra
n
ch 'ab/test-2'
commit
|
commitdiff
|
tree
2010-09-04
Ju
n
io C Haman
o
Merg
e
b
r
an
c
h 'js/
d
etached-st
a
sh'
commit
|
commitdiff
|
tree
2010-09-04
Junio C Hamano
Merge branch 'js/maint-ref
l
og-beyond-horizon'
commit
|
commitdiff
|
tree
2010-09-04
J
unio C Hamano
Merg
e
branch 'dg/local-mod
-
err
o
r
-messages
'
commit
|
commitdiff
|
tree
2010-09-04
Junio C Hama
n
o
Merge
b
ranch
'
nd/mai
n
t-fix-
r
eplace'
commit
|
commitdiff
|
tree
2010-09-04
Ngu
y
ễn Thái Ngọc Duy
parse_object
:
pa
s
s
on the
o
r
i
ginal sha1, not
the replace
d
one
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-03
Junio
C H
a
mano
Merge bra
n
c
h 'ab/co
m
pa
t
-r
e
gex
'
commit
|
commitdiff
|
tree
2010-09-03
Ju
n
io C Hamano
Merge
branch
'
nd/clone-depth
-
zero'
commit
|
commitdiff
|
tree
2010-09-03
Junio C Haman
o
Merge br
a
nch 'jn/maint-d
o
c
-
user-manual-h
t
m
l
-doctype'
commit
|
commitdiff
|
tree
2010-09-03
Junio C Hamano
Merge branch 'cb/
m
aint-merg
e
tool-no
-
tt
y
'
commit
|
commitdiff
|
tree
2010-09-03
Junio C Hamano
Merge branch 'jn/apply-f
i
lename-
w
ith-sp'
commit
|
commitdiff
|
tree
2010-09-03
Jun
i
o
C Hamano
Merge branch 'jn
/
me
r
ge-
c
ustom-
n
o-trivial'
commit
|
commitdiff
|
tree
2010-09-03
J
u
ni
o
C
Hama
n
o
Merge b
r
anc
h
'jc/main
t
-doc-em-d
a
sh
'
commit
|
commitdiff
|
tree
2010-09-03
Junio C
H
amano
Merge branch 'mg/doc-bundle'
commit
|
commitdiff
|
tree
2010-09-03
Jun
i
o
C Hamano
Merg
e
b
r
anch 'jn/doc-bac
k
sla
s
h'
commit
|
commitdiff
|
tree
2010-09-03
Jun
i
o C Hamano
Mer
g
e b
r
a
n
ch 'jn/update-contr
i
b-example-merge'
commit
|
commitdiff
|
tree
2010-09-03
Junio C
Hama
n
o
Me
r
ge branch 'jn/m
e
rge
-
renor
m
aliz
e
'
commit
|
commitdiff
|
tree
2010-09-03
Junio C Hamano
S
ync w
i
t
h 1
.
7
.
2
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-03
Junio C Hamano
Git 1
.
7
.
2
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-03
Th
i
ago Far
i
n
a
bu
i
l
tin/
m
er
g
e
_
recurs
i
ve
.
c: A
d
d an usage st
r
ing and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-03
J
e
ns Lehmann
t
7
4
0
6 & t7407: add
miss
i
ng
&
& at e
n
d
of lines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-03
Jens Lehmann
t7
4
0
5
: cd
i
nside subshell instead of
aro
u
n
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-03
Matthieu Moy
t760
9
-merge
-
co-
e
rror-msgs: test
non-fast forward case
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-03
M
a
tthieu Moy
Move "show_all_errors = 1" to
setup_unpack_trees_
p
orcelain()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-03
Matthi
e
u
Moy
s
etup_unpack_tr
e
es_p
o
rcelain:
t
a
ke
th
e
w
hole options
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-03
Mat
t
hi
e
u M
o
y
Mov
e
set_p
o
rcelain_error_msgs to unpac
k
-trees
.
c and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-01
Jun
i
o
C Ha
m
an
o
P
r
e
p
are for 1
.
7
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-01
Juni
o
C
H
amano
Mer
g
e br
a
nch 'm
a
i
nt
'
commit
|
commitdiff
|
tree
2010-09-01
Junio C Hamano
Prepare for 1
.
7
.
2
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-01
J
u
nio C H
a
mano
Me
r
ge branch 'gp/p
a
ck-refs-remove-emp
t
y-dirs'
into
.
.
.
commit
|
commitdiff
|
tree
2010-09-01
J
u
n
io C Ham
a
no
Mer
g
e branch
'
sg/rer
e
r
e
-gc-old-still-use
d
' into
maint
commit
|
commitdiff
|
tree
2010-09-01
Junio
C
H
amano
M
e
rge branch 'np/mai
n
t-huge-delta-generation' into
.
.
.
commit
|
commitdiff
|
tree
2010-09-01
J
u
nio
C
Hamano
Merge branch 'dj/fetch-
t
agopt'
i
nto
m
ain
t
commit
|
commitdiff
|
tree
2010-09-01
Junio C Ha
m
ano
Merge branch
'da/fix-subm
o
dule-s
y
n
c-superproj
e
ct-c
o
nfig
.
.
.
commit
|
commitdiff
|
tree
2010-09-01
Ju
n
i
o
C
H
amano
Merge bra
n
ch 'en/reb
a
se-against-reb
a
se-fi
x
' into maint
commit
|
commitdiff
|
tree
2010-09-01
Jun
i
o C Hamano
install-webd
o
c:
f
i
l
t
er
times
t
a
mp-only c
h
a
nges corre
c
tly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-31
Junio C Hamano
Merge b
r
anch 'np/maint-huge-delta-
g
eneration'
commit
|
commitdiff
|
tree
2010-08-31
Junio
C Ha
m
ano
Merge branch '
d
a/fix-submo
d
ule-sync-supe
r
proje
c
t-con
f
ig'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Hamano
Me
r
ge br
a
nch 'jn/cherry-r
e
vert-message
-
c
l
ean-up'
commit
|
commitdiff
|
tree
2010-08-31
J
un
i
o
C
Ham
a
no
Merge branch 'cb/
b
i
n
a
ry-p
a
tch-id'
commit
|
commitdiff
|
tree
2010-08-31
Junio
C
H
a
m
a
no
Me
r
ge
branch 'ab/ma
i
n
t-reset
-
mixed-w-pathsp
e
c-advice
'
commit
|
commitdiff
|
tree
2010-08-31
Junio
C
Ham
a
n
o
M
erge branch 'dj/f
e
tch-t
a
g
opt'
commit
|
commitdiff
|
tree
2010-08-31
Junio C
H
amano
Merge
bran
c
h 'en/d-f-conflict-fix'
commit
|
commitdiff
|
tree
2010-08-31
J
unio C Hamano
Merge b
r
anch 'jn/
s
vn-fe'
commit
|
commitdiff
|
tree
2010-08-31
Junio
C
H
a
m
ano
M
e
rge bran
c
h 'tr/mai
n
t-n
o
-
unquote-plus'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Hamano
Merge bra
n
c
h
'jn
/
pagina
t
e
-
fix'
commit
|
commitdiff
|
tree
2010-08-31
Junio
C
H
ama
n
o
Merge bran
c
h 'jn/maint-setup-
f
ix'
commit
|
commitdiff
|
tree
2010-08-31
Ju
n
i
o
C Hamano
Me
r
g
e
branch 'en
/
fast-ex
p
o
r
t-fi
x
'
commit
|
commitdiff
|
tree
2010-08-31
J
unio C Hamano
Merge branch 'hv/a
u
to
s
quash-conf
i
g'
commit
|
commitdiff
|
tree
2010-08-31
Ju
n
io C Haman
o
Me
r
g
e bran
c
h '
s
g/rerere-gc
-
o
l
d-
s
t
ill-used'
commit
|
commitdiff
|
tree
2010-08-31
M
atthieu
M
oy
tests: fa
c
t
o
r HOME=$(pwd) i
n
test-
l
ib
.
s
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-31
Æ
v
ar Arnfjörð Bjarmaso
n
test-lib: use subshell
instead o
f
cd
$
new &&
.
.
&&
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-31
J
onat
h
an Nie
d
er
tests: simplify
"missing P
R
EREQ"
m
ess
a
ge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-31
Ævar Arnfj
ö
rð Bjarmas
o
n
t/t0000-bas
i
c
.
sh:
R
un
the passing TODO tes
t
inside
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-31
Ævar A
r
nfjörð Bjarmason
test-lib: All
o
w overriding of TEST_DIRE
C
TORY
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-31
Æ
var Arnfjörð
B
ja
r
mason
t
e
st-lib: Use
"$GIT_B
U
ILD_
D
IR" ins
t
ead of "
$
TEST
_
DIRECTORY
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-31
Æva
r
A
r
nfjörð
B
jarm
a
son
tes
t
-li
b
: Us
e
$TEST
_
D
I
RECTORY or $G
I
T_BUILD_DIR in
s
tea
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-31
Thomas Rast
test: Introdu
c
e $G
I
T
_
BUILD_DI
R
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-31
Anders K
a
seor
g
g
itweb: Do
n
't die_error
in git_tag aft
e
r a
l
ready printing
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-31
J
on Sey
m
o
ur
t3903: fi
x
broken te
s
t_mu
s
t_fail calls
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-31
J
on Seymour
t150
3
: fix b
r
oken test_m
u
s
t_fail calls
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-30
Jens
L
eh
m
an
n
checkout: Use submodule
.
*
.
ign
o
re sett
i
ngs from
.
g
i
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-30
Jens Lehmann
c
h
ecko
u
t: Add test for diff
.
ignoreSubmodu
l
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-30
Junio C Hamano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2010-08-30
J
unio C Ha
m
ano
M
erge branch 'maint-1
.
7
.
1' into maint
commit
|
commitdiff
|
tree
2010-08-30
Thiago Fa
r
ina
obje
c
t
.
h
: Add
O
BJECT_
A
RRAY_INIT mac
r
o and
make use
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-30
Ma
t
thi
e
u Moy
t0
0
03: add m
i
ssing
&
& at end of lines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-26
Junio C Hamano
Merg
e
b
r
anc
h
'maint'
commit
|
commitdiff
|
tree
2010-08-26
Jay Soffian
for-each
-
r
e
f: fix obje
c
tnam
e
:sh
o
rt bu
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-26
Johannes Sixt
F
ix comp
a
t/r
e
gex AN
S
Ification on MinGW
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-25
Eli
j
ah Newren
tree-wa
l
k: Correct bitrotte
d
comment about tree_entry()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-25
Joha
n
nes Schindelin
checkout
:
resp
e
ct diff
.
ignor
e
Submodules sett
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-25
Linus T
o
r
valds
Fix 'git log' early pager startup error ca
s
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-24
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-08-24
J
on
Seymour
re
v
-parse:
t
ests git rev-
p
ars
e
--verify master@{n}
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-24
Jon Seymour
sha1_
n
a
m
e
.
c: use war
n
ing
i
n preference to fprintf(stderr
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-24
Jon Seymour
rev-parse: exi
t
with
non-zero status if ref
@
{n} is
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-24
Jonathan Nie
d
er
parse-options: cl
a
rify P
A
RSE_
O
PT_NOARG
d
es
c
ript
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-24
Jonatha
n
N
i
eder
t3302 (not
e
s
)
: Port to S
o
lar
i
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-24
Brian Gern
h
a
r
dt
t7606: Avoid
usin
g
h
ead as
a f
i
l
e
name
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-24
Ju
n
io C Ham
a
no
Work around em-dash handling
in newe
r
Asci
i
D
o
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-24
B
rian Gernhard
t
t7610: cd inside su
b
shell instead of around
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-24
Nguyễn Thái Ng
ọ
c D
u
y
clone: warn users
--depth is
i
gn
o
red in lo
c
al clones
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-23
Michael
J Gr
u
ber
git-bundle
.
t
xt: Cl
a
rify rev-list-args res
t
rictions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-23
M
i
c
hael J
G
ruber
git-bundle
.
txt
:
whitespace cleanup
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-23
Mi
c
ha
e
l
J G
r
uber
git-bund
l
e
.
txt: Cleanup
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next