repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jc/grep-header-all-match-fix' into next
2010-09-04
Junio C Hamano
Merge bra
n
ch
'j
s
/maint-reflog-b
e
yo
n
d-hori
z
o
n
'
commit
|
commitdiff
|
tree
2010-09-04
J
unio C Hama
n
o
Merge branch 'dg/local-mod-erro
r
-messa
g
es'
commit
|
commitdiff
|
tree
2010-09-04
J
unio C Hamano
M
e
rge branch
'
nd/main
t
-
f
i
x-re
p
lac
e
'
commit
|
commitdiff
|
tree
2010-09-04
Nguyễn Thái Ngọc Du
y
parse_obj
e
ct:
p
ass
o
n the or
i
gi
n
al sha1, not
t
he replaced one
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-03
Schalk, Ken
RE: [PATCH] A
v
oid re
n
a
me
/
a
d
d conflict when
c
o
n
tents
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-03
J
u
nio C Hamano
M
erge
b
ranch
'ab/comp
a
t-re
g
ex'
commit
|
commitdiff
|
tree
2010-09-03
Juni
o
C
Ha
m
ano
Merge branch
'
n
d/clone-depth-zero'
commit
|
commitdiff
|
tree
2010-09-03
Jun
i
o C Hamano
Merge branch '
j
n/maint-doc-
u
ser
-
man
u
al-html-doctype'
commit
|
commitdiff
|
tree
2010-09-03
J
u
nio C
H
amano
M
e
r
ge branch 'cb
/
main
t
-
m
ergetoo
l
-no-tty'
commit
|
commitdiff
|
tree
2010-09-03
Ju
n
io C H
a
m
ano
Merge branch 'j
n
/
apply-fi
l
ename-with-sp'
commit
|
commitdiff
|
tree
2010-09-03
Junio C Hamano
Merge branch 'jn
/
m
e
rg
e
-custom
-
no-tr
i
vial'
commit
|
commitdiff
|
tree
2010-09-03
Junio C Hamano
Merge branch 'jc/ma
i
n
t-doc-em-dash'
commit
|
commitdiff
|
tree
2010-09-03
Junio
C
Hamano
Me
r
ge branch '
m
g
/doc-bund
l
e'
commit
|
commitdiff
|
tree
2010-09-03
Junio
C
Hamano
Merge branch
'jn/do
c
-
ba
c
kslash'
commit
|
commitdiff
|
tree
2010-09-03
Junio C Hamano
Merge branch 'jn/update-co
n
trib-example-m
e
rge'
commit
|
commitdiff
|
tree
2010-09-03
Jun
i
o
C
Ham
a
no
Merge branch 'jn/
m
erg
e
-re
n
o
rmalize'
commit
|
commitdiff
|
tree
2010-09-03
Junio C Hamano
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
Gi
t
1
.
7
.
2
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-03
Thi
a
go
Farina
builtin/merge_recursive
.
c: Add an usage string an
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-03
Jen
s
Lehmann
t7406 & t7407
:
a
dd missing &
&
at en
d
of lines
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-03
Jens Lehmann
t
7
405: cd
i
n
side subshell
i
ns
t
ead of aroun
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-03
Matthieu Moy
t7609-merge-co-error-ms
g
s
:
test
n
on-fast fo
r
ward case
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-03
Matthieu Moy
Move "sho
w
_all_err
o
rs = 1" to setup_unpack_tre
e
s_porcelain()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-03
Matth
i
eu Moy
s
e
t
up_unpack_
t
ree
s
_porcelain: tak
e
the whole option
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-03
M
a
tthieu Moy
Mov
e
set_
p
orcela
i
n
_err
o
r_msgs to unpack-trees
.
c and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-01
Junio C H
a
m
a
no
Prepare for 1
.
7
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-01
Junio
C
Hamano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2010-09-01
Junio C
Ham
a
no
Pre
p
ar
e
f
o
r 1
.
7
.
2
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-01
Junio C Hama
n
o
M
e
rg
e
branch 'gp/pa
c
k-r
e
fs-r
e
move-empty-dirs' into
.
.
.
commit
|
commitdiff
|
tree
2010-09-01
Junio C H
a
m
a
no
Merge branch 'sg/
r
ere
r
e-gc-old-still-used' into maint
commit
|
commitdiff
|
tree
2010-09-01
Junio C Haman
o
Merge branch 'np
/
maint-huge-de
l
ta-gen
e
ration' into
.
.
.
commit
|
commitdiff
|
tree
2010-09-01
Junio
C
Hamano
Merge
branch 'dj
/
f
e
t
ch-tagopt' into maint
commit
|
commitdiff
|
tree
2010-09-01
Junio
C Ha
m
ano
Merge bra
n
c
h
'
d
a/fix-submodule-s
y
n
c-super
p
roject-
c
onfig
.
.
.
commit
|
commitdiff
|
tree
2010-09-01
Jun
i
o C Hama
n
o
M
erge branc
h
'e
n
/r
e
b
ase-again
s
t
-
re
b
ase-fix' in
t
o
ma
i
n
t
commit
|
commitdiff
|
tree
2010-09-01
Petr O
n
derka
Add global
a
n
d syste
m
-wide gitattributes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-01
Ju
n
io
C
Ham
a
no
in
s
ta
l
l-we
b
doc: fi
l
ter
t
im
e
stamp-only changes co
r
re
c
tl
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-01
Thi
a
go Farina
builtin
.
h: M
o
ve two functions definitions to
h
elp
.
h
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-31
Junio C Haman
o
Merge
bran
c
h '
n
p/maint-huge-
d
el
t
a-genera
t
i
o
n'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Hamano
Merge b
r
anch '
d
a/fix
-
submo
d
ule-sync-
s
upe
r
p
roj
e
ct-config'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Haman
o
Merge branch '
j
n/c
h
err
y
-
rever
t
-mes
s
age-clean-up
'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Hamano
Merge bra
n
c
h 'cb/bina
r
y-pa
t
ch-id'
commit
|
commitdiff
|
tree
2010-08-31
Junio
C Hamano
Merge
b
ranc
h
'
a
b/maint-reset-mixed
-
w-paths
p
ec-
a
dvice'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Hamano
Merge branch 'dj/fetch-tagopt'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Hama
n
o
Merge bran
c
h 'en/d-f-confli
c
t-fix'
commit
|
commitdiff
|
tree
2010-08-31
Ju
n
io C Hamano
M
e
rge branch 'jn/svn
-
fe'
commit
|
commitdiff
|
tree
2010-08-31
Jun
i
o C Ham
a
no
Me
r
ge bra
n
ch 'tr/maint-n
o
-unquote-plus'
commit
|
commitdiff
|
tree
2010-08-31
Juni
o
C Hamano
Me
r
ge
bra
n
ch 'jn/pag
i
nate-
f
ix'
commit
|
commitdiff
|
tree
2010-08-31
Juni
o
C
H
amano
Merge branch 'jn/ma
i
nt-setup-fix'
commit
|
commitdiff
|
tree
2010-08-31
J
u
nio C Ham
a
no
Merg
e
br
a
nch 'en/fast-
e
xpor
t
-fi
x
'
commit
|
commitdiff
|
tree
2010-08-31
J
uni
o
C Hamano
Merge bra
n
c
h 'hv
/
autosqua
s
h
-
config'
commit
|
commitdiff
|
tree
2010-08-31
Junio C
H
a
mano
Merge branch 'sg/rerer
e
-gc-old-stil
l
-used'
commit
|
commitdiff
|
tree
2010-08-31
Junio C Hamano
diff
/
log -G<pattern>: tests
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-31
Ju
n
io C Hama
n
o
git
l
og/diff: add
-G<regexp> tha
t
grep
s
in th
e
patch
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-31
J
un
i
o C Hamano
diff: pass the entire diff-o
p
tions to diffcore
_
pickaxe()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-31
J
u
nio
C
Hamano
gitdi
f
fcore doc: update
pickaxe description
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-31
M
atthieu Moy
tests:
factor HOME=$(
p
w
d
)
in test-lib
.
sh
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-31
Ævar A
r
nfjörð B
j
a
r
m
a
son
test-lib: use subs
h
ell
instead of cd $new &&
.
.
&&
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-31
Jonathan Nieder
tests: simplify "missing PREREQ" message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-31
Ævar Arnfjörð Bjarmason
t
/
t
00
0
0-basic
.
sh: Ru
n
the passing TODO test inside
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-31
Ævar Arnfjörð Bjarm
a
son
test-lib: All
o
w overriding of TEST_DIREC
T
OR
Y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-31
Ævar Arnf
j
örð Bjarmason
t
est-l
i
b:
U
se "$GIT_BUILD
_
DIR"
i
nstead of "
$
TEST_DIREC
T
ORY
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-31
Ævar Arnfjörð Bja
r
ma
s
on
t
est-lib: Use $TEST_DIRECTORY or $GIT_BUILD
_
DIR ins
t
ead
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-31
T
h
omas Rast
test: In
t
roduce $GIT_BUILD_DIR
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-31
Jonathan Nieder
te
s
ts: make
t
est_m
i
ght_fail
fail on missing commands
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-31
Jonat
h
a
n
Nieder
tests: make test
_
might_fai
l
m
o
r
e ver
b
ose
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-31
J
o
han
H
e
r
land
not
e
s: Don
'
t create (empty) commit when removing non
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-31
Knut Fra
n
ke
Extend
documen
t
ation of cor
e
.
askpass an
d
GIT_A
S
KPA
S
S
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-31
Knut F
r
a
nke
Allow core
.
askpass to override SSH_ASKPASS
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-31
Ans
e
lm Kruis
Add a new option 'core
.
askpass'
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-31
J
e
ff King
te
s
ts: mak
e
t
est_mu
s
t_fa
i
l
f
a
i
l on mi
s
sing comman
d
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-31
J
eff King
te
s
ts: mak
e
t
e
s
t_must_fail mor
e
verbose
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-31
Anders
K
aseo
r
g
gitweb: D
o
n't die
_
error in git_
t
ag after already prin
t
in
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-31
Jon Seymour
t3903: f
i
x
b
r
oken
test_must_fail c
a
lls
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-31
J
on Seymour
t15
0
3: fix bro
k
en test
_
must
_
f
ai
l
call
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-30
Jens
L
ehman
n
ch
e
ckout: Use subm
o
dule
.
*
.
ignore settings fro
m
.
git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-30
Jens Lehman
n
checkout: Add test for diff
.
ignoreSubmodules
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-30
Juni
o
C
H
ama
n
o
Me
r
ge branch '
m
a
int'
commit
|
commitdiff
|
tree
2010-08-30
Juni
o
C Hamano
Me
r
g
e branch 'ma
i
nt-1
.
7
.
1'
into m
a
int
commit
|
commitdiff
|
tree
2010-08-30
Thiago Farin
a
object
.
h: A
d
d
O
B
JECT_ARRA
Y
_INI
T
ma
c
ro and make u
s
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-30
Matthieu
M
o
y
t
0
0
03: add missi
n
g && a
t
end of lines
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-27
Ramkumar Ra
m
achandra
format-patch: Don'
t
go o
v
er
m
e
r
ge co
m
mits
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-27
Ramkumar Rama
c
handra
t4
0
14
-
f
ormat-pa
t
ch: Call test_t
i
ck before com
m
itting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-27
Cs
a
ba Hen
k
f
i
lter-branch:
retire --remap
-
to-an
c
esto
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-27
Csaba
He
n
k
b
undle:
detect
i
f bundle
file c
a
nn
o
t
be created
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-27
Gr
e
g Brock
m
an
shell
:
Disp
l
ay e
r
r
ors from improperly-f
o
rmatted comm
a
nd
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-27
Justin Fr
a
nkel
merge-re
c
ursive: options to ignore w
h
itespace changes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-27
Junio C Hamano
Merge br
a
nch 'gb/spl
i
t
-
cmdl
i
ne-errm
s
g
' into gb/sh
e
ll-ext
commit
|
commitdiff
|
tree
2010-08-26
Junio C Hamano
Merge
b
ranch 'main
t
'
commit
|
commitdiff
|
tree
2010-08-26
Jay Soffian
for-each-ref: fix o
b
jec
t
name:short bug
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-26
Elija
h
Newren
diff_t
r
ee
(
): Skip s
k
i
p_un
i
nterestin
g
() when all remaining
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-26
Elijah Newren
tree_entr
y
_intere
s
ting(): Make return
value
more specif
i
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-26
Elijah
Newren
tree-walk: Cor
r
e
ct bitrotted comme
n
t
about tree_entry()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-26
Elija
h
Newren
Docum
e
nt pre-conditi
o
n
for tree_entry_i
n
teresting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-26
J
o
hannes Sixt
Fix compat/regex
A
NSI
f
i
c
ation
o
n MinGW
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-26
Justi
n
F
r
ankel
merge-recursive --
p
atien
c
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-26
Jonathan N
i
e
d
er
ll-merge: replace flag argument with options struct
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-26
Jonathan N
i
ed
e
r
merge-recursive: expos
e
merge options
f
or bu
i
lti
n
m
erge
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-25
Elijah Ne
w
r
e
n
tree-walk: Correct bi
t
rott
e
d comment about tree_
e
ntry()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-25
Brandon Casey
buil
t
in/fetch
.
c
:
ignore
m
er
g
e confi
g
when not fetchi
n
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-08-25
Brandon Casey
t/t5510: demo
n
st
r
ate fa
i
lur
e
to
fe
t
c
h when current
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next