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
revert: clarify label on conflict hunks
2010-03-21
Jonath
a
n Nie
d
er
revert: clarify
l
abel
o
n
conflic
t
hunks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Niede
r
compa
t
: add mem
p
cpy(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
c
heckout -m --conflict=diff3:
a
d
d
a
la
b
el
f
o
r ance
s
tor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
ath
a
n Nieder
merge_trees():
a
dd ancestor l
a
bel p
a
r
a
meter
f
or diff3
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
han Nieder
merge_fi
l
e
(
):
add comm
e
nt
exp
l
aining beha
v
ior wrt con
f
lict
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
c
h
e
ckout --conflict=d
i
ff3: a
d
d a label for an
c
estor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
N
i
eder
ll_merge(): add an
c
e
sto
r
label parameter for diff3
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
than Nied
e
r
merge
-
file --diff3
:
add
a label
fo
r
ances
t
or
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nathan Nie
d
er
xdl_merge(): mo
v
e file1 and file2
l
abels to
x
mparam
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
x
dl_merge(): add optional ancestor lab
e
l
t
o diff
3
-style
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
tests: do
c
ument ch
e
r
ry-pick
behavior i
n
face
of conflicts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nathan Niede
r
tests:
document form
a
t of confli
c
ts from check
o
ut -m
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jun
i
o C Hamano
Update draft
re
l
ease
n
o
tes to 1
.
7
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Junio
C Hamano
M
e
rge branch 'j
k
/maint-add-ignored-dir'
commit
|
commitdiff
|
tree
2010-03-20
Junio C
Hamano
Merge br
a
nch 'ml/color-gr
e
p'
commit
|
commitdiff
|
tree
2010-03-20
J
u
nio C H
a
man
o
Merge br
a
nch
'jc
/
co
l
or-attrs'
commit
|
commitdiff
|
tree
2010-03-20
J
uni
o
C
Hamano
M
e
rge branch 'cc/reset-kee
p
'
commit
|
commitdiff
|
tree
2010-03-20
Junio C H
a
mano
M
e
r
ge br
a
nch 'f
l
/askp
a
ss'
commit
|
commitdiff
|
tree
2010-03-20
Junio
C Hamano
Me
r
ge
b
ranch 'bg/ap
p
ly-fi
x
-blank-at-e
o
f'
commit
|
commitdiff
|
tree
2010-03-20
Junio
C Ha
m
ano
Merge branch 'bw/
u
nion-mer
g
e-
r
efacto
r
'
commit
|
commitdiff
|
tree
2010-03-20
Junio C
H
ama
n
o
M
e
rge bra
n
c
h
'maint
'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Ha
m
an
o
U
p
date
d
raft release notes to 1
.
7
.
0
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
A
n
dre
a
s G
r
uenbacher
f
etch: Fix minor
memory leak
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Andre
a
s Gru
e
nbacher
fetch: Future-proof ini
t
ialization
o
f
a
refsp
e
c on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
A
n
d
reas Gruenb
a
c
her
fetch: Check for a "^{}
"
suffix with suffixcmp()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
B
e
n
jamin C Meyer
Fix a spelling
mistake in a git-p4 console message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Brian Gernhardt
Use
t
e
s
t_expect_succes
s
fo
r
test
s
et
u
ps
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
I
m
re Deak
da
e
m
on: par
s
e_hos
t
_and_port SIGSEGV if po
r
t is specified
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
J
o
n
athan N
i
e
d
er
Makefi
l
e: Fix occasional GIT-
C
F
L
AGS break
a
ge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jonath
a
n
N
ie
d
er
Ma
k
efile: Fix
C
D
PATH p
r
oblem
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Brand
o
n Casey
no
t
es
.
c: remov
e
inappropriate c
a
ll to return
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Stephen Bo
y
d
p
ull: replac
e
u
n
n
e
cessary s
e
d inv
o
cation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
J
u
nio C Ha
m
ano
Merge branch
'
maint
'
commit
|
commitdiff
|
tree
2010-03-17
Thomas Rast
Documen
t
ation: receive
.
d
eny
C
ur
r
entBranch d
e
faults to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Ian War
d
Comfort
bash: complete
*_HEAD refs if present
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Ju
n
io C Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2010-03-15
Michael J Gru
b
er
Documen
t
ation
/
git-read-
t
re
e
: clarify 2-tree merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-15
Michael J G
r
uber
Doc
u
menta
t
ion/git-read-tree: fix table
layout
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-15
Ju
n
io C Hamano
Merge
b
ranch 'sd/f
o
rm
a
t-patch-
t
o'
commit
|
commitdiff
|
tree
2010-03-15
Junio C H
a
mano
Merge branch 'tc/
h
ttp-c
l
eanup'
commit
|
commitdiff
|
tree
2010-03-15
Junio
C
Ha
m
ano
M
erge
b
ra
n
ch
'
tc/transport-verbosity
'
commit
|
commitdiff
|
tree
2010-03-15
Junio C H
a
mano
Merge branch 'ld
/
push-porc
e
lain'
commit
|
commitdiff
|
tree
2010-03-15
Junio C
Hamano
Merge
b
r
anch 'jh/n
o
tes'
commit
|
commitdiff
|
tree
2010-03-14
J
u
nio C Hamano
t
e
st
s
for "git add ignor
e
d
-dir/file" without -
f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-14
Jeff
King
dir: fix COLLE
C
T_IG
N
O
R
ED
o
n
excluded
p
refixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-14
Junio C
Hamano
t
0
0
5
0: ma
r
k
n
on-working
te
s
t as suc
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-14
Junio C Hamano
Merge bra
n
ch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-03-14
D
a
v
e
Olszewski
do
n
't
use def
a
u
l
t revision if a rev was
spe
c
i
fied
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
René S
c
harfe
for
_
ea
c
h_
r
ecent_reflog_ent()
:
use str
b
uf, fix offset
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Junio
C
Hamano
t/Ma
k
efile: remove
t
est art
i
facts
u
pon "make clean"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Ren
é
Schar
f
e
blame: fix indent of line
n
umb
e
r
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Junio C
H
amano
Merge
git://git
.
bogo
m
ips
.
org/git
-
s
vn
commit
|
commitdiff
|
tree
2010-03-13
Junio C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-03-12
J
u
nio C Haman
o
t5516: Use t
e
s
t
_cmp w
h
en appro
p
riate
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-12
Juni
o
C Hamano
t
9400: U
s
e
te
s
t_cmp wh
e
n appropriate
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-10
J
u
n
io C Haman
o
Mer
g
e
branch 'sd/init-template'
commit
|
commitdiff
|
tree
2010-03-10
Junio
C
H
a
mano
M
e
r
g
e b
r
a
n
ch
'sh/am-
k
e
e
p-cr'
commit
|
commitdiff
|
tree
2010-03-10
Jun
i
o
C Ha
m
ano
Merg
e
branch '
c
p/ad
d
-
u
-
pa
t
hspec'
commit
|
commitdiff
|
tree
2010-03-10
Junio C Hamano
Makefile: update check
-
docs target
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-10
Junio
C
Hamano
Merge
bran
c
h 'lt/deepen-builtin
-
sourc
e
'
commit
|
commitdiff
|
tree
2010-03-09
Jun
i
o C Hamano
Documentat
i
on: improv
e
d
escription of
"gi
t
reset -
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-08
Stephen
B
o
y
d
send-email: add --
n
o-cc, --no-to, and
-
-
n
o-bcc
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-08
Ste
p
h
en
Boyd
format-pa
t
ch:
a
dd -
-
n
o
-cc
,
--no-to, and --no-
a
d
d-headers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-08
Steph
e
n B
o
y
d
fo
r
ma
t
-patch: use a string_lis
t
for h
e
aders
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Updat
e
dra
f
t relea
s
e n
o
tes to 1
.
7
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-08
J
u
nio C Ham
a
no
Mer
g
e branch
'
maint'
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Mer
g
e accumulated fi
x
e
s
to prepare
for 1
.
7
.
0
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-08
Juni
o
C Hamano
Merge branch 'mw/maint-
g
cc-warns
-
unused
-
write'
into
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Merge branch 'fn/
m
aint-mkdtemp-compat' in
t
o
maint
commit
|
commitdiff
|
tree
2010-03-08
Junio
C
H
a
m
ano
M
e
rge branch 'gb/ma
i
nt-subm
o
d
ule-e
n
v' into maint
commit
|
commitdiff
|
tree
2010-03-08
Ju
n
io C Hamano
Mer
g
e br
a
nch
'
a
s/maint-expire' into maint
commit
|
commitdiff
|
tree
2010-03-08
Juni
o
C Hamano
Merge branc
h
'ml/
m
ain
t
-grep-
d
oc' into maint
commit
|
commitdiff
|
tree
2010-03-08
Jun
i
o C Hamano
Merge
b
ranch 'jk/maint
-
p
u
sh-tracking-wo-re
m
o
t
e' in
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
J
unio C
H
a
m
ano
Merge branch
'
jc/
f
etch-param'
into maint
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Mer
g
e br
a
nch 'ne/pack-local-doc' into ma
i
nt
commit
|
commitdiff
|
tree
2010-03-08
Juni
o
C
Ha
m
a
n
o
Merge b
r
an
c
h
'
jk/maint-add--interactive-d
e
let
e
'
i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Juni
o
C H
a
m
ano
Merge branch
'mm/mkstemps-mo
d
e-for-packfiles'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Junio C Ha
m
ano
Mer
g
e b
r
anch 'jc/maint-fi
x
-m
a
ili
n
f
o-strip' into m
a
int
commit
|
commitdiff
|
tree
2010-03-08
J
u
nio
C
Ha
m
ano
Merge branch 'jc/grep-author
-
all-mat
c
h-
i
mplicit'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Junio
C H
a
mano
M
erg
e
br
a
n
c
h
'jc/checkout-det
a
ched'
into maint
commit
|
commitdiff
|
tree
2010-03-08
Junio C
Hamano
Merge
b
ranch 'maint
-
1
.
6
.
6' into maint
commit
|
commitdiff
|
tree
2010-03-08
Mark Lo
d
at
o
grep: Col
o
rize
se
l
ected, cont
e
x
t
, and fun
c
tion lines
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-08
Mar
k
Lodato
grep: Co
l
o
r
ize filename,
l
i
n
e number,
and sepa
r
a
to
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-07
Juni
o
C Ham
a
no
Merge branch 'j
c
/maint-fix-test-perm' into maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Me
r
g
e
bra
n
c
h
'
sp
/
maint-push-sideband' into maint
-
1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Merge
bran
c
h
'
h
m/main
t
-imap-send-crlf' into maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Juni
o
C Hamano
Merg
e
br
a
nch 'gf/maint-
s
h-setu
p
-nong
i
t-ok' i
n
t
o maint
.
.
.
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Mer
g
e br
a
nch 'jk/main
t
-rmdir-
f
ix'
into maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
J
u
ni
o
C Hamano
Merge
branch 'rs/optim-text-w
r
ap' into m
a
int-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio C
Ham
a
no
Mer
g
e
branch 'tr/maint-cherry-pick-list
'
into maint
.
.
.
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
M
e
r
ge branch 'cc/
m
aint-bis
e
ct-path
s
' into
maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio C
H
amano
Merge br
a
nch
'
mw/maint-gcc-war
n
s-unu
s
ed-wr
i
t
e
'
commit
|
commitdiff
|
tree
2010-03-07
Junio
C
Hamano
Merge branch 'as/maint-e
x
p
i
re'
commit
|
commitdiff
|
tree
2010-03-07
Junio
C
Hamano
Mer
g
e bran
c
h
'
ml/m
a
i
n
t-grep-d
o
c
'
commit
|
commitdiff
|
tree
2010-03-07
Jun
i
o C Hamano
Merge branch 'fn/maint-mkdtemp-compat'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hama
n
o
Merge branc
h
'gb/maint-su
b
m
odule-env'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Merge branch 'ne/pac
k
-
l
o
c
al-doc'
commit
|
commitdiff
|
tree
2010-03-07
Jun
i
o C
H
aman
o
Merge branc
h
'mb/
s
hortlog-non
g
it-stdin'
commit
|
commitdiff
|
tree
2010-03-07
Jun
i
o C Ham
a
no
Me
r
ge branch '
j
k/maint-push-tra
c
king-wo-remote
'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Ham
a
no
Merge b
r
anch '
j
c/fetch-
p
aram'
commit
|
commitdiff
|
tree
next