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
diff-files: show unmerged entries correctly
2011-04-24
Junio C Hamano
diff-fil
e
s: s
h
ow un
m
erged
e
n
t
ries corr
e
c
tly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
diff: remove often un
u
sed
parameters from di
f
f_unmerge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Ham
a
no
diff
.
c: retu
r
n filepair f
r
om diff_unmerge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio
C Ha
m
ano
tes
t
: use
$
_z40 from test-lib
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-18
J
u
nio
C
Hamano
Git 1
.
7
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-18
Junio C Hamano
Mer
g
e bran
c
h '
j
s/ls-files-
x
-doc'
commit
|
commitdiff
|
tree
2010-09-17
Chri
s
J
o
h
n
sen
git
-
r
e
b
ase--interactive
.
s
h
:
replac
e
cut with ${v%
%
*}
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-17
Bra
n
don Casey
t/t7300: workaround ancient t
o
uch by rearrang
i
ng a
r
g
um
e
nts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-16
Junio
C
Hama
n
o
M
e
rge branch
'bg/
f
ix-t7003'
commit
|
commitdiff
|
tree
2010-09-16
Junio C Hamano
ls-
f
i
l
e
s
d
ocumentation:
r
eword for consistency
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-16
Jay Soffian
git-ls-files
.
t
x
t: c
l
a
rify -x
/
--e
x
clud
e
o
p
t
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-15
Juni
o
C
Hamano
Git 1
.
7
.
3 rc2
commit
|
commitdiff
|
tree
2010-09-15
Junio C Ha
m
ano
Me
r
ge branc
h
'dr/maint-ls
-
tr
e
e
-
pre
f
ix-recursi
o
n-fix
'
commit
|
commitdiff
|
tree
2010-09-15
Junio C
H
a
mano
Merge
b
ranch 'os/fi
x
-rebase-diff-
n
o
-
prefix'
commit
|
commitdiff
|
tree
2010-09-15
J
u
n
io C
Hamano
Mer
g
e branch 'jl/fix-test
'
commit
|
commitdiff
|
tree
2010-09-15
Junio C
H
amano
Mer
g
e bra
n
c
h 'c
h
/filter-b
r
anc
h
-d
e
pre
c
ate-re
m
ap-to
-
anc
e
stor'
commit
|
commitdiff
|
tree
2010-09-15
Junio C
H
amano
Merge bra
n
ch 'c
h
/maint-cann
o
t-create-bundle-error'
commit
|
commitdiff
|
tree
2010-09-15
Junio C Hamano
Merge branch 'ks/recursive
-
rename-add-ide
n
tical'
commit
|
commitdiff
|
tree
2010-09-15
Junio
C Hamano
Merge git://
r
epo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2010-09-13
Brian Gernhar
d
t
t7003:
Use test_commit in
s
t
e
a
d of custom function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-12
Junio C Hama
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-09-12
Jun
i
o C Hamano
ls-tree $di $dir: do not mi
s
takenly recurse into
d
irectories
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-12
Junio C Ha
m
ano
t3101:
modernise style
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-12
Ramsay
J
o
n
es
vcs
-
s
vn: Fix
s
ome printf
f
ormat compiler warnings
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-11
René Scharfe
compat
/
nedmall
o
c:
d
on
'
t force NDEB
U
G
on
the rest
of git
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-10
J
u
nio C Hama
n
o
Git 1
.
7
.
3
rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-10
Ju
n
io
C
H
amano
Merge bran
c
h 'np/
r
elnotes-in-su
b
dir'
commit
|
commitdiff
|
tree
2010-09-10
Junio
C Ham
a
no
Prepare fo
r
1
.
7
.
3 rc1
commit
|
commitdiff
|
tree
2010-09-10
Junio C H
a
m
a
no
Me
r
ge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-09-10
Mar
k
Lodato
config
.
txt:
fix place
m
ent of di
f
f
.
noprefix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-10
Brandon Casey
t/t4018: avoid two unnecessary s
u
b
-
shell invocations
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-10
Junio C Hamano
Me
r
ge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2010-09-10
Brandon
Casey
t/t4018: test whether the word_reg
e
x patterns compile
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-10
Brandon Casey
xdiff-int
e
rfa
c
e
.
c:
a
lways trim tr
a
iling space
f
r
om
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-10
B
randon Casey
diff
.
c
: call regfr
e
e t
o
free memory
allocated by r
e
gcomp
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-10
Brando
n
C
a
sey
t/t5510-fe
t
ch
.
sh:
i
mprove
t
e
s
ting with expl
i
c
it UR
L
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-10
Brandon Casey
built
i
n
/
fetch
.
c
: comment
th
a
t
branch->remote_na
m
e
i
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-10
Brandon Casey
Makefile: use com
p
at regex on IRIX 6
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-10
Brandon Cas
e
y
t/t7008: workaroun
d
broken handling of \000 by printf
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-10
Oded
S
him
o
n
Add --src/dst
-
prefix to git
-
for
m
t-patch in gi
t
-
r
ebase
.
sh
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-09
J
uni
o
C H
a
mano
install-we
b
doc: kee
p
ins
t
alled
R
el
N
otes-*
.
tx
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-09
Jens Le
h
m
a
nn
t
1
0
2
0: Ge
t
rid of
'
c
d "$HERE"' at the
sta
r
t of each
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-09
Jonat
h
an
N
ieder
t2016 (che
c
kout -
p
): add missing &
&
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-09
Jonat
h
an Nieder
t1302 (core
.
repositoryversi
o
n): styl
e
t
w
eaks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-09
Jonathan Nieder
t2105
(gitfile
)
:
a
d
d
missing &&
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-09
J
o
nathan Nieder
t1450 (fsck):
r
e
move d
a
n
glin
g
objects
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-09
J
onathan N
i
e
de
r
test
s
: subshell inden
t
ation stylefix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-08
Junio
C Ham
a
no
Me
r
ge br
a
nch 'tf/c
l
ean
u
p-
b
uiltin
-
help-
h
e
aders'
commit
|
commitdiff
|
tree
2010-09-08
J
u
nio C Hamano
Merge branch
'
j
k/test
-
must-f
a
i
l
-missing
'
commit
|
commitdiff
|
tree
2010-09-08
Junio C Haman
o
M
erge branc
h
'jh/erro
r
-removing
-
missing-note'
commit
|
commitdiff
|
tree
2010-09-08
Junio C Hama
n
o
M
e
rg
e
b
r
anch 'kf/askpass
-
config'
commit
|
commitdiff
|
tree
2010-09-08
Junio C Hamano
Merge branch
'
bc/ma
i
nt-fetch-url-only'
commit
|
commitdiff
|
tree
2010-09-08
Junio C Hamano
M
e
r
ge br
a
n
c
h 'jk/main
t
-pass-c-c
o
nfig-in-env'
commit
|
commitdiff
|
tree
2010-09-08
J
u
nio C Ham
a
no
Merg
e
branch 'en/
d
-
f-conflict-
f
ix'
commit
|
commitdiff
|
tree
2010-09-08
J
o
h
annes Sixt
fast-export: ensure that a renamed
f
ile is printed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-07
Nicolas Pitre
Documentatio
n
:
m
ove Re
l
Notes into a direc
t
ory of t
h
e
ir
own
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-07
J
unio C
Ham
a
no
M
e
rge branc
h
'maint'
commit
|
commitdiff
|
tree
2010-09-07
Elijah Newren
revert: Fix trivial comment style issue
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-07
Elij
a
h Newren
c
a
c
he_t
r
ee_free
:
Fix small memory leak
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-06
Junio C Ham
a
n
o
Merg
e
bra
n
ch 'jh/cl
e
a
n-
e
xc
l
u
de'
commit
|
commitdiff
|
tree
2010-09-06
Thiago F
a
rina
builtin/clean
.
c:
U
se STRING_LIST_
I
NIT_NODUP
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-06
Ju
n
io C Hama
n
o
Merge b
r
anc
h
'jl
/
maint-fix-test'
commit
|
commitdiff
|
tree
2010-09-06
J
ens
L
ehmann
Severa
l
tests:
cd i
n
side subshell in
s
tead of
a
round
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-06
Jens Lehman
n
t34
0
4 & t7508: cd inside
subshell instead of a
r
oun
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-06
Jun
i
o C Hamano
M
erge branch
'maint'
commit
|
commitdiff
|
tree
2010-09-06
J
unio C
Hamano
Merge b
r
anch 'xx/t
r
i
v
i
a
l' into maint
commit
|
commitdiff
|
tree
2010-09-06
Junio C Hamano
tag
.
c: whitespace
b
r
eakages
fix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-06
Jared Hance
Fix whitespace issue in o
b
ject
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-06
Jens Lehmann
t5505: add missing &&
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-04
Junio C H
a
mano
Merge bran
c
h 'j
l
/submodu
l
e-i
g
nore-diff'
commit
|
commitdiff
|
tree
2010-09-04
Junio C Hama
n
o
Merge branc
h
'ab/test-2'
commit
|
commitdiff
|
tree
2010-09-04
J
unio C
Hamano
Merg
e
branch 'js
/
d
e
ta
c
h
ed-stas
h
'
commit
|
commitdiff
|
tree
2010-09-04
J
u
nio C Hamano
Merg
e
branch '
j
s/mai
n
t-
r
efl
o
g-beyond-horizon'
commit
|
commitdiff
|
tree
2010-09-04
Junio C
Ham
a
no
Merge branch 'dg/local-mod-error-me
s
sa
g
es'
commit
|
commitdiff
|
tree
2010-09-04
J
u
nio C Hamano
Merge branc
h
'nd/m
a
i
n
t-f
i
x
-replace'
commit
|
commitdiff
|
tree
2010-09-04
N
guy
ễ
n Th
á
i Ngọ
c
Duy
parse_ob
j
ect: pass on the original sha1, not the re
p
lac
e
d one
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-03
Sc
h
alk,
K
en
RE: [PATCH] Avoid
rename/add conflic
t
wh
e
n
c
ontents
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-03
Junio
C
Hamano
Me
r
g
e b
r
anch 'ab/c
o
m
p
at-r
e
gex'
commit
|
commitdiff
|
tree
2010-09-03
Junio C Ha
m
ano
Merge b
r
a
nch '
n
d/clone-depth-zero'
commit
|
commitdiff
|
tree
2010-09-03
Junio
C
Hamano
Merge
b
r
a
nch 'j
n
/maint-doc-user-manual-html-doctyp
e
'
commit
|
commitdiff
|
tree
2010-09-03
J
unio C H
a
mano
Merge branch 'cb/maint-mergetool-no-tty'
commit
|
commitdiff
|
tree
2010-09-03
Junio C Hamano
Mer
g
e b
r
anch 'jn/a
p
ply-filename-wit
h
-
sp'
commit
|
commitdiff
|
tree
2010-09-03
J
u
ni
o
C Hama
n
o
Merge branch
'
jn/mer
g
e-custom-n
o
-trivial'
commit
|
commitdiff
|
tree
2010-09-03
Junio C
Ha
m
a
no
Merge branch 'jc/m
a
int-doc-em-da
s
h'
commit
|
commitdiff
|
tree
2010-09-03
J
u
nio C Hamano
Merge branch 'mg
/
doc
-
bundle'
commit
|
commitdiff
|
tree
2010-09-03
Junio
C Hamano
Merge
b
ranch 'jn/doc-backslash'
commit
|
commitdiff
|
tree
2010-09-03
Junio C Hamano
Merge branch 'jn/update-contrib
-
example-merge'
commit
|
commitdiff
|
tree
2010-09-03
Junio C Haman
o
Merge branc
h
'
jn/merge-r
e
norm
a
lize'
commit
|
commitdiff
|
tree
2010-09-03
J
u
nio C
Ham
a
no
S
y
nc with 1
.
7
.
2
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-03
Junio C
H
amano
Git 1
.
7
.
2
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-03
Thiago Fa
r
i
n
a
built
i
n
/merge_rec
u
r
s
ive
.
c
:
A
d
d an usa
g
e
s
t
ring and
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-03
Jens Lehmann
t7406 &
t
7407: add
m
i
s
sing
&& at end of li
n
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-03
Je
n
s Lehmann
t
7405
:
cd inside subshe
l
l i
n
stead
of
a
r
ound
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-03
M
at
t
hi
e
u Moy
t7609-merge-co
-
e
r
ror-msgs:
t
est no
n
-fast fo
r
ward case
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-03
Matt
h
ieu Moy
Move "show_al
l
_
e
rrors
= 1" to setup_unpack_trees_p
o
rce
l
ain(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-03
M
atthieu
Moy
setup_unpack_
t
rees_p
o
rcelai
n
: take the w
h
ole
options
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-03
Ma
t
thieu M
o
y
Mo
v
e set_
p
orcelain_err
o
r
_msgs to unpack-trees
.
c a
n
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-01
J
u
nio
C Hamano
P
re
p
are
f
or 1
.
7
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-09-01
Junio C Hamano
Merge bra
n
ch 'main
t
'
commit
|
commitdiff
|
tree
2010-09-01
Junio C Hamano
Pre
p
are for 1
.
7
.
2
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next