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 'gb/shell-ext'
2010-09-04
J
u
ni
o
C Hamano
Merge branch 'dg/lo
c
al-mod-error
-
messa
g
es'
commit
|
commitdiff
|
tree
2010-09-04
Junio C
Hamano
Merge branch 'nd/m
a
int-fi
x
-replace'
commit
|
commitdiff
|
tree
2010-09-04
N
guy
ễ
n Thái Ngọc
D
uy
parse_ob
j
ect:
p
a
ss on the original sha1, not th
e
replaced
o
ne
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-03
Schalk, Ken
RE: [PATCH] Avoid rename/add
conflict whe
n
co
n
te
n
ts
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-03
Junio
C
Ham
a
n
o
Merge br
a
nch '
a
b
/
co
m
pat-regex'
commit
|
commitdiff
|
tree
2010-09-03
Junio C Hamano
Mer
g
e
bran
c
h 'nd/clone-depth-zero'
commit
|
commitdiff
|
tree
2010-09-03
Junio C Hamano
Merge branch 'jn/mai
n
t-doc
-
user-manua
l
-html-do
c
type'
commit
|
commitdiff
|
tree
2010-09-03
Junio C
Hamano
M
erge branch 'cb/maint-merget
o
o
l-no-tty'
commit
|
commitdiff
|
tree
2010-09-03
Junio C Ha
m
ano
Merge bran
c
h 'jn/apply-fi
l
ename-with-sp'
commit
|
commitdiff
|
tree
2010-09-03
Junio C Hamano
M
e
rge
b
ranch
'
jn/merg
e
-custom-n
o
-trivial'
commit
|
commitdiff
|
tree
2010-09-03
Junio
C Hamano
Merg
e
bran
c
h 'jc/maint
-
d
oc-em-dash
'
commit
|
commitdiff
|
tree
2010-09-03
Jun
i
o
C
Ha
m
ano
Merge branc
h
'mg/doc-b
u
ndle'
commit
|
commitdiff
|
tree
2010-09-03
Junio C Hamano
Merge branch 'jn/doc-backslash'
commit
|
commitdiff
|
tree
2010-09-03
Junio C Ha
m
ano
Me
r
g
e b
r
anch 'jn/update-cont
r
ib-exampl
e
-merge'
commit
|
commitdiff
|
tree
2010-09-03
Junio C Hamano
M
e
r
ge b
r
anch 'jn/
m
erge-renormalize'
commit
|
commitdiff
|
tree
2010-09-03
Junio C Haman
o
Sync with
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 Farin
a
builtin
/
m
e
rge_recur
s
ive
.
c: A
d
d an usage
string and
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-03
Jens L
e
hmann
t7406 & t7
4
0
7
: add missing && at end o
f
lines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-03
Jens Lehma
n
n
t7
4
05: cd
i
nside subshell in
s
t
ead of around
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-03
Ma
t
thieu M
o
y
t76
0
9-mer
g
e-co-error-ms
g
s
:
test non-fast forward case
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-03
Matthi
e
u M
o
y
Mo
v
e "show_all_
e
rrors =
1" to se
t
up_
u
npack_trees_porcelain()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-03
Matthieu Moy
s
e
tup_unpack_trees_porce
l
ain: take the whole opt
i
o
ns
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-03
Matthieu Moy
M
ove set_porcelain
_
error_msgs t
o
u
npac
k
-
trees
.
c a
n
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-01
Junio C Ha
m
ano
Prepare fo
r
1
.
7
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-01
Junio
C Hamano
Merge branch '
m
aint'
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
Junio C Hamano
M
erge branch 'gp/pa
c
k-refs-remove-
e
mpty-dirs' into
.
.
.
commit
|
commitdiff
|
tree
2010-09-01
Junio C Haman
o
Merge branch 'sg/rere
r
e
-gc-old
-
still-use
d
' into main
t
commit
|
commitdiff
|
tree
2010-09-01
Junio C H
a
mano
Merge b
r
anch 'np/maint-huge-de
l
t
a
-generation' into
.
.
.
commit
|
commitdiff
|
tree
2010-09-01
Juni
o
C Hamano
Merge branch 'dj/fet
c
h-tago
p
t'
i
nto maint
commit
|
commitdiff
|
tree
2010-09-01
Jun
i
o C Hamano
Merge branc
h
'da/fix-submodu
l
e-sync-
s
uperproj
e
ct-config
.
.
.
commit
|
commitdiff
|
tree
2010-09-01
J
u
nio C Hamano
Merg
e
br
a
nch 'en
/
rebase-against-rebase
-
fix' into maint
commit
|
commitdiff
|
tree
2010-09-01
Petr Onder
k
a
Add global and sys
t
em-wi
d
e gitattributes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-01
J
uni
o
C Ha
m
ano
install-webdoc: filter
t
imestamp-only changes cor
r
ectly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-09-01
Thi
a
go Farina
bu
i
ltin
.
h: Move two f
u
nc
t
ions defi
n
itions to h
e
lp
.
h
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-31
Jun
i
o C Ha
m
ano
Merge
branch '
n
p/
m
aint
-
h
uge-d
e
lta
-
g
eneration'
commit
|
commitdiff
|
tree
2010-08-31
J
unio C H
a
m
ano
Merge branch 'da/fix-submodule-sync-superproject
-
c
onfig'
commit
|
commitdiff
|
tree
2010-08-31
Junio C H
a
m
ano
Merge b
r
a
n
c
h
'j
n
/cherr
y
-
r
e
vert-me
s
s
a
g
e-clean
-
u
p
'
commit
|
commitdiff
|
tree
2010-08-31
Ju
n
io C Hamano
M
e
rge branch
'
c
b
/
binar
y
-patch-i
d
'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Hamano
M
e
rge
branch
'ab/ma
i
nt-
r
eset-mixed-w-p
a
thspec-advice'
commit
|
commitdiff
|
tree
2010-08-31
Junio C
H
amano
M
erge branch 'dj/fetch-tagopt'
commit
|
commitdiff
|
tree
2010-08-31
Junio
C Ham
a
no
Mer
g
e branch 'e
n
/d-f-conflic
t
-fix'
commit
|
commitdiff
|
tree
2010-08-31
Junio C
H
amano
Mer
g
e b
r
anc
h
'jn/svn-fe'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Hamano
Merge branch 'tr/maint-no-
u
nq
u
ot
e
-plus'
commit
|
commitdiff
|
tree
2010-08-31
Junio C
Hamano
Merge
branc
h
'jn/paginate-fix'
commit
|
commitdiff
|
tree
2010-08-31
J
u
nio
C
Ha
m
ano
Merge branch 'jn/maint-setup-fix'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Hamano
M
e
rge branch 'en/f
a
s
t
-export-fix'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Hamano
Merg
e
b
ranch 'hv
/
autosqu
a
sh-config'
commit
|
commitdiff
|
tree
2010-08-31
Juni
o
C Ha
m
ano
Merge br
a
nch 'sg/rerer
e
-gc-old-still-used'
commit
|
commitdiff
|
tree
2010-08-31
Matt
h
ieu Moy
tests:
f
a
ctor HOME=$
(
pwd)
in test-lib
.
sh
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-31
Ævar Arnfjörð Bjarmason
tes
t
-li
b
: us
e
subshel
l
i
nstead
o
f
c
d $new &&
.
.
&&
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-31
Jonathan
N
iede
r
tests: simplify "missing PREREQ"
m
essage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-31
Æv
a
r Arnfjö
r
ð Bjarmason
t/t000
0
-b
a
sic
.
sh: Run the
pa
s
sing TODO test
i
nside
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-31
Ævar
A
rnfjör
ð
Bjarmason
test-lib:
Allow overriding of
TEST_
D
IRECTORY
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-31
Ævar Arnfjörð Bjar
m
aso
n
t
e
st-lib
:
Use "$GI
T
_BUILD_DIR"
i
nstead of "$TE
S
T_DIRECTORY
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-31
Ævar Arnfjö
r
ð B
j
armason
test-lib: Use $TEST_DIRECTORY o
r
$GIT_BUILD_DIR inst
e
ad
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-31
Thomas Rast
test:
Intro
d
uc
e
$GIT_BUILD_DIR
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-31
Jo
n
athan
N
ied
e
r
tests: make test
_
mi
g
h
t_fa
i
l fail
on
m
issin
g
c
o
m
ma
n
ds
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-31
Jonathan Ni
e
de
r
tests:
make te
s
t_mi
g
ht_f
a
i
l
more v
e
rbose
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-31
Jo
h
an He
r
l
and
notes:
Don't
creat
e
(
e
m
pt
y
) comm
i
t w
h
en removing non
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-31
Knut
Franke
Extend documentatio
n
of core
.
askpa
s
s
and GIT_ASKPASS
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-31
K
n
u
t
F
r
a
nke
Allow core
.
a
skpass to override SSH_ASKP
A
SS
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-31
Ansel
m
Kruis
Add a new option 'core
.
a
skp
a
ss'
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-31
J
e
ff King
t
est
s
:
make t
e
s
t_must_fa
i
l fail on mis
s
in
g
command
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-31
Jeff King
tests: make test
_
mus
t
_fail
m
ore verbo
s
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-31
Anders K
a
seorg
g
itw
e
b
:
Don't
d
ie_
e
rror in git_tag
a
f
ter alrea
d
y pr
i
n
ti
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-31
Jon Seymour
t
3
903: f
i
x broken test_
m
ust_f
a
il
calls
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-31
Jon S
e
ymour
t
1
5
03
:
fix broken test
_
mu
s
t_fail calls
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-30
J
e
ns Lehmann
checkout:
Use s
u
bmodule
.
*
.
igno
r
e settings
f
rom
.
g
i
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-30
Jens
L
ehmann
checkout: Add te
s
t for diff
.
ig
n
oreSub
m
odules
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-30
Junio C
H
amano
M
e
r
ge b
r
anch '
m
ai
n
t'
commit
|
commitdiff
|
tree
2010-08-30
Junio C Hamano
Merge
bran
c
h 'main
t
-
1
.
7
.
1' i
n
to
m
aint
commit
|
commitdiff
|
tree
2010-08-30
T
h
i
ago F
a
rina
object
.
h:
Add O
B
J
E
CT_ARRAY
_
I
N
IT macro
a
n
d make
u
se
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-30
Matthieu Moy
t0003: add missing &
&
at
e
nd of
l
ines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-27
Csaba
H
enk
fi
l
ter-bran
c
h: ret
i
r
e
--remap-to-ancestor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-27
Csaba Henk
bundle: detect if bund
l
e file cannot be created
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-27
Greg Brockman
shell
:
Display errors fro
m
imp
r
operly
-
f
o
rmatted c
o
m
m
a
nd
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-27
Junio C Hamano
Merge branch 'gb
/
spl
i
t-cmdline-e
r
r
m
s
g' in
t
o
g
b
/sh
e
ll-ext
commit
|
commitdiff
|
tree
2010-08-26
Junio C
H
amano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2010-08-26
Jay Soffian
for-each-ref: fix
o
bjec
t
name:short bug
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-26
J
o
h
annes Sixt
Fix co
m
pat/regex ANSIfication on M
i
nGW
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-25
E
lijah N
e
wren
tre
e
-walk: Correct bitrott
e
d comment ab
o
ut tr
e
e_
e
ntry()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-25
Brand
o
n Casey
builtin/fetch
.
c
:
ignore merge c
o
nfig
when not
fetching
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-25
Bran
d
o
n Casey
t/t5510: demonstrate failure
t
o fetch w
h
en current
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-25
Johannes Schindelin
che
c
kout: re
s
pect di
f
f
.
ignoreSubmodules setting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-25
Lin
u
s Torvalds
Fix '
g
it l
o
g
' earl
y
p
ager startup
error case
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-24
Junio
C
Ham
a
n
o
Merge branch '
m
a
int'
commit
|
commitdiff
|
tree
2010-08-24
Ramkumar
Rama
c
han
d
ra
she
l
l: Rewrite documentation and improve error message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-24
Jon
S
e
y
mour
rev-pa
r
se: tests git
r
e
v-parse --
v
erify mas
t
er@{n}
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-24
J
o
n Se
y
mour
sha1
_
name
.
c: use warning in preference
t
o
f
printf(
s
tderr
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-24
J
o
n Seymour
rev-
p
arse: exi
t
w
it
h
n
o
n-zero s
t
atus if ref@{n} i
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-24
Jo
n
athan
N
i
e
der
p
a
rse-options: c
l
ari
f
y PARSE_OPT_NOARG description
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-24
Jo
n
athan Nieder
t3302
(
n
otes
)
: Port to Sol
a
ris
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-24
B
r
ian Gernhardt
t76
0
6
:
Avoid usi
n
g head as a file name
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-24
Jonathan
Nieder
do
not pas
s
"
g
i
t -c foo=bar
"
params
t
o transport
help
e
rs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-24
Je
f
f King
pa
s
s
"
git
-c
f
oo=bar" params
t
h
r
ough enviro
n
ment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-24
Juni
o
C H
a
mano
Wor
k
aro
u
nd em-dash
h
a
ndling in
n
e
wer Asc
i
i
Doc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-24
Brian Gernhardt
t7610: cd
i
n
side subshell instead
o
f aroun
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-08-24
Nguy
ễ
n T
h
á
i
Ngọc D
u
y
clone: w
a
rn us
e
rs
-
-depth i
s
i
g
nored
i
n local cl
o
nes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next