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
xdl_merge(): move file1 and file2 labels to xmparam structure
2010-03-21
Jonathan
N
ied
e
r
xdl_merge(): mo
v
e file1
a
nd file2 la
b
els to xmparam
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
xd
l
_
merge(): add opt
i
onal ance
s
tor label
t
o diff3-style
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nath
a
n Nied
e
r
tests: document
cher
r
y-p
i
c
k b
e
havior in
f
a
ce of
conf
l
i
c
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
J
on
a
tha
n
Nied
e
r
tests: document format
of conflicts
from checkout -m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Update dr
a
ft rele
a
se
notes to 1
.
7
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Junio C
H
amano
Me
r
g
e
branc
h
'jk
/
maint-add-
i
gnored-dir'
commit
|
commitdiff
|
tree
2010-03-20
Ju
n
io C Hamano
Merge
branch 'ml
/
color-grep'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Me
r
ge branch 'jc/col
o
r-attrs'
commit
|
commitdiff
|
tree
2010-03-20
J
u
n
i
o
C
Ha
m
a
no
Merge branc
h
'cc
/
reset-keep'
commit
|
commitdiff
|
tree
2010-03-20
Ju
n
i
o C Hamano
Merge branch
'fl/ask
p
ass'
commit
|
commitdiff
|
tree
2010-03-20
Junio C H
a
m
ano
Merge
b
ra
n
ch '
b
g/app
l
y-fix
-
blan
k
-at-eof'
commit
|
commitdiff
|
tree
2010-03-20
J
unio C
Hamano
Merge
b
ranch 'bw
/
unio
n
-mer
g
e
-refactor'
commit
|
commitdiff
|
tree
2010-03-20
J
u
nio C Haman
o
Merge b
r
anch
'
maint'
commit
|
commitdiff
|
tree
2010-03-20
Junio C
H
a
m
ano
U
p
date draft rel
e
ase note
s
to 1
.
7
.
0
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Andreas Gruenbacher
fetch: Fix minor memory leak
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Andreas Gru
e
n
b
ache
r
fetch: Future-proof i
n
i
t
ialization of a re
f
spec o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Andreas Gr
u
enbacher
fetch:
C
heck
f
or
a "^{}"
s
uffix wit
h
suffixcmp
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Benjamin C Meyer
Fix
a
sp
e
l
l
ing mistake in a git-
p
4 co
n
sole message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
B
r
ian G
e
rnhard
t
Use t
e
s
t_
e
xpect_s
u
cces
s
for test setups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Im
r
e Deak
daemon: parse
_
host_and_
p
ort SIGSEGV if
p
o
r
t
is s
p
ecifi
e
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
J
o
nathan Nied
e
r
Ma
k
efile:
F
ix occasional G
I
T
-
C
F
L
AGS brea
k
age
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
J
o
nathan Nieder
Makefile: Fix CDPATH problem
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Brando
n
Casey
notes
.
c: remove i
n
a
p
propr
i
at
e
call t
o
retu
r
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
S
tephen
B
o
yd
pull: replace unnecessa
r
y sed i
n
vocation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Junio C Hamano
Merge
b
ra
n
ch '
m
ai
n
t'
commit
|
commitdiff
|
tree
2010-03-17
T
ho
m
as
R
ast
Documentation: re
c
eive
.
d
enyCurrentBranc
h
def
a
ults to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Ia
n
Ward
C
omfort
bash
:
complete *_HEAD ref
s
if pres
e
nt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Junio C Ham
a
no
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2010-03-15
Michae
l
J Gruber
Documentation/git-read-tree:
c
larify 2-tree merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-15
Michael
J G
r
uber
Documentation/git-read-tree: fix table l
a
yout
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-15
Junio C Hama
n
o
Me
r
g
e bra
n
ch '
s
d/form
a
t-patch-
t
o'
commit
|
commitdiff
|
tree
2010-03-15
Junio
C
Ha
m
ano
M
e
rge branch 'tc/htt
p
-cl
e
anup'
commit
|
commitdiff
|
tree
2010-03-15
Junio C Hamano
M
e
rge
b
ranch '
t
c/transport-v
e
r
bosity'
commit
|
commitdiff
|
tree
2010-03-15
Junio C
H
aman
o
Merge
b
ranch 'ld/push-po
r
celain'
commit
|
commitdiff
|
tree
2010-03-15
Junio C Ha
m
a
no
Merge branch 'j
h
/n
o
tes'
commit
|
commitdiff
|
tree
2010-03-14
Junio
C
H
a
mano
test
s
for "git a
d
d ignored-dir/file" w
i
t
h
o
u
t
-
f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Jeff Ki
n
g
dir: fix
COLLECT_IGNORED
on excluded prefixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Junio
C Ha
m
ano
t
0
050: m
a
rk no
n
-working te
s
t as such
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Junio
C Hamano
Merge
branch 'm
a
int'
commit
|
commitdiff
|
tree
2010-03-14
Dave O
l
szews
k
i
don't u
s
e default revision i
f
a rev was specified
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
René Scharfe
for_each_
r
ecent_r
e
f
log_ent(): use
s
trbuf, fix offse
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Junio
C
Hama
n
o
t
/
Ma
k
e
file:
r
em
o
ve test a
r
t
i
f
acts upon "make clean"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
R
e
n
é Scha
r
f
e
blame
:
fix indent of line numbers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Junio
C
Hamano
M
erge git://git
.
bogomips
.
org/git-s
v
n
commit
|
commitdiff
|
tree
2010-03-13
Jun
i
o C Haman
o
Mer
g
e b
r
anch
'
m
aint'
commit
|
commitdiff
|
tree
2010-03-12
Junio
C
H
a
m
a
no
t5516: Use
test_cm
p
wh
e
n
appropr
i
a
t
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-12
Junio C Hamano
t
940
0
:
U
s
e test
_
cmp
when ap
p
ropriate
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-10
Junio
C Hamano
Mer
g
e branch
'
sd/init-t
e
mplate'
commit
|
commitdiff
|
tree
2010-03-10
Junio
C
Haman
o
Mer
g
e branch 'sh/
a
m-keep-cr'
commit
|
commitdiff
|
tree
2010-03-10
J
un
i
o C
Hamano
Merge
b
ranc
h
'cp/add-u-paths
p
ec'
commit
|
commitdiff
|
tree
2010-03-10
J
u
nio C Ha
m
a
n
o
Makefile: upda
t
e check
-
docs target
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-10
Ju
n
io C H
a
mano
Merge branch 'lt/d
e
epen-builtin-source'
commit
|
commitdiff
|
tree
2010-03-09
J
u
n
i
o
C Hamano
Documentation: improve description of
"
gi
t
reset -
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
Ste
p
he
n
Boyd
sen
d
-ema
i
l: ad
d
--
n
o-cc, --no-
t
o, and
-
-no-bcc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
Stephen Boyd
form
a
t-pat
c
h:
a
dd --no
-
cc, -
-
no-to,
a
nd -
-
no-add-
h
e
a
ders
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
S
t
ephen B
o
yd
forma
t
-p
a
tch: use a strin
g
_l
i
s
t
f
o
r hea
d
ers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
Junio
C
H
ama
n
o
U
pdate draft release n
o
tes t
o
1
.
7
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
J
u
nio
C Hamano
M
erge branch
'maint'
commit
|
commitdiff
|
tree
2010-03-08
Ju
n
i
o
C Hamano
Mer
g
e accumulated fixes t
o
prepare
for 1
.
7
.
0
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
J
u
nio C
H
amano
Merge branch 'mw/maint
-
g
cc-war
n
s-unused-write
'
int
o
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
J
unio C Ha
m
ano
Mer
g
e branch 'fn/maint-mkdtemp-comp
a
t' i
n
to maint
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Merge branch 'gb/main
t
-
submo
d
ule-
e
nv'
i
nto maint
commit
|
commitdiff
|
tree
2010-03-08
Ju
n
io
C
Hamano
Mer
g
e branch 'as/maint-expir
e
' into maint
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Merge br
a
n
ch 'ml/m
a
int
-
g
r
e
p-doc'
into maint
commit
|
commitdiff
|
tree
2010-03-08
Jun
i
o C Hama
n
o
Merge bran
c
h
'jk/mai
n
t
-pu
s
h-tracking-wo-remote' into
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Merge branch '
j
c/fetch-param' into maint
commit
|
commitdiff
|
tree
2010-03-08
Jun
i
o C Hamano
Mer
g
e branch 'n
e
/pack-
l
o
cal-doc' into
m
aint
commit
|
commitdiff
|
tree
2010-03-08
J
u
nio C H
a
m
ano
Merge branch
'
jk/maint-add--int
e
ractive-dele
t
e'
into
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Merge b
r
a
nch 'mm/m
k
stemps-mode-for-packf
i
les' into
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
M
erge branc
h
'jc/mai
n
t-fix-mailinfo-strip' into maint
commit
|
commitdiff
|
tree
2010-03-08
J
u
n
io C Hamano
Me
r
ge bra
n
ch 'jc
/
grep-author-all-match-implicit' into
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
J
u
nio C Hamano
Me
r
ge b
r
anch 'jc/che
c
k
o
ut-detached' in
t
o
m
aint
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hama
n
o
Merge branch 'maint-1
.
6
.
6' into m
a
in
t
commit
|
commitdiff
|
tree
2010-03-08
Mar
k
Lodato
grep:
Coloriz
e
selecte
d
, context, and f
u
nction
line
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
Mark Lodato
g
re
p
: Colori
z
e file
n
a
me, lin
e
number
,
and separator
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
M
e
rge b
r
anch 'jc/maint-fix-t
e
st-p
e
r
m'
in
t
o
maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio C
H
a
ma
n
o
Merge br
a
nch 'sp/m
a
i
nt-push-sideband' into maint
-
1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
J
unio C Hamano
Me
r
ge branch 'hm/maint-imap-se
n
d-crlf' into ma
i
nt-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Merge bra
n
c
h
'gf/maint-sh-se
t
up-nongit-
o
k' into maint
.
.
.
commit
|
commitdiff
|
tree
2010-03-07
Junio C
Hamano
Me
r
ge
br
a
n
c
h
'
jk
/
m
aint-rmd
i
r-fix' into maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio C Ha
m
ano
Merge branch
'rs/optim-text-wr
a
p' into maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio C
H
a
mano
M
e
rge branc
h
'
tr
/
maint-cherr
y
-pick-list' into m
a
int
.
.
.
commit
|
commitdiff
|
tree
2010-03-07
Junio C
Hamano
Merge branch 'cc/maint-b
i
sec
t
-p
a
ths' into
m
aint
-
1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Ju
n
io C Hamano
M
erge branch 'mw/maint-gc
c
-warns-unused-w
r
ite
'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hama
n
o
M
e
rge branch
'
as/
m
aint-expire'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Merg
e
bra
n
ch 'ml/maint-grep-doc'
commit
|
commitdiff
|
tree
2010-03-07
J
u
nio C
H
amano
Merge branch 'fn/ma
i
nt-mkd
t
emp
-
compat'
commit
|
commitdiff
|
tree
2010-03-07
Junio C
H
amano
Merge branch
'
gb/ma
i
nt-s
u
b
modul
e
-env'
commit
|
commitdiff
|
tree
2010-03-07
Jun
i
o
C
H
a
mano
Merge br
a
nch '
n
e/pack-loc
a
l-doc'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Ham
a
no
Merge branch 'mb
/
s
h
ortl
o
g-n
o
n
g
it
-
stdin'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hama
n
o
M
e
rge branch
'jk
/
maint-push-tracking-wo-remot
e
'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Merg
e
bra
n
c
h
'jc/fetch-par
a
m'
commit
|
commitdiff
|
tree
2010-03-07
J
u
ni
o
C
Hama
n
o
Merge branc
h
'il/loose
n
-
r
emote-helper-names'
commit
|
commitdiff
|
tree
2010-03-07
J
un
i
o C
H
amano
Merge branch
'nd/root
-
git'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
M
erge branc
h
'js
/
runtim
e
-prefix-
t
race-not
-
warn
'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Ha
m
ano
Merge br
a
nch 'mm/
m
kstemps-
m
o
d
e-for-packfiles'
commit
|
commitdiff
|
tree
2010-03-07
Junio C H
a
mano
Merge b
r
anch 'jk/maint-a
d
d--interac
t
i
v
e-delete'
commit
|
commitdiff
|
tree
2010-03-07
Junio C
Hamano
Me
r
ge br
a
nch
'
jc/maint-fix-ma
i
li
n
fo-st
r
ip'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
col
o
r
:
allow
m
ult
i
ple
a
ttributes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
S
y
nc with 1
.
7
.
0
.
2
commit
|
commitdiff
|
tree
next