repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
merge_trees(): add ancestor label parameter for diff3-style output
2010-03-21
Jonathan Nieder
merg
e
_trees(
)
: a
d
d ancest
o
r l
a
bel para
m
e
ter for
d
iff3
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
merge_file(): add com
m
e
n
t explain
i
ng b
e
h
avior wrt conflict
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Ni
e
der
checko
u
t --confl
i
ct=diff3: add a label fo
r
a
n
cestor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
J
onath
a
n Nieder
ll_merge
(
): add a
n
cestor label p
a
rameter
f
or
diff3
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
merge-fil
e
-
-diff3: add a label
f
o
r
a
n
cestor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
N
ieder
xdl_merge(): move file1 and file2 labels to
x
mpara
m
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan Nieder
xdl_merg
e
(
)
: add opti
o
nal an
c
e
stor label to diff3-style
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
athan
N
i
eder
test
s
: d
o
cument
c
h
er
r
y
-
pick behavior in face of conflic
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
n
athan Nied
e
r
tests: document
f
ormat of co
n
f
l
i
cts
from ch
e
ckout -m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Junio
C
H
amano
Up
d
ate draf
t
r
e
lease notes to
1
.
7
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
J
unio C Ham
a
n
o
Merge branch 'jk/maint-add-ignored-dir'
commit
|
commitdiff
|
tree
2010-03-20
Junio
C
Ham
a
n
o
M
er
g
e branch 'ml/col
o
r-grep'
commit
|
commitdiff
|
tree
2010-03-20
Juni
o
C
Ha
m
ano
M
e
rge branch 'jc
/
color-attrs'
commit
|
commitdiff
|
tree
2010-03-20
J
unio
C Haman
o
Merge
br
a
nch '
c
c/
r
eset-keep'
commit
|
commitdiff
|
tree
2010-03-20
J
unio C Hamano
Merg
e
br
a
nch
'fl/askpass'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Ham
a
no
M
erge branch 'bg/
a
pp
l
y-fix-blank-at-eof'
commit
|
commitdiff
|
tree
2010-03-20
J
unio
C
Hamano
Merge
branch 'bw/union
-
merge-r
e
fact
o
r
'
commit
|
commitdiff
|
tree
2010-03-20
Jun
i
o
C
H
amano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2010-03-20
Junio C
Hamano
Update
draft releas
e
notes to
1
.
7
.
0
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
And
r
ea
s
Gruenbacher
fetch: Fix minor memory leak
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
And
r
e
as
Gruenbacher
fetch: Future-pro
o
f
i
niti
a
l
i
zation
o
f
a refspe
c
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Andreas
G
ruenbacher
fetch: Che
c
k fo
r
a "^{}"
suf
f
ix
w
ith suffixc
m
p()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Be
n
jamin C
Meyer
Fix a s
p
elling mist
a
ke i
n
a git-p4 console
m
essage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Brian Gernhardt
Use t
e
st_
e
xpect_s
u
ccess for test setup
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
I
m
re D
e
ak
d
a
emon:
p
arse_host
_
and_
p
ort
SIG
S
EGV if p
o
rt is
s
p
e
c
i
f
i
ed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Jon
a
t
han Nieder
Makefile: Fi
x
o
c
c
a
sional GIT-
C
FLAGS bre
a
kage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan Nieder
Makefile: Fix
CDPATH problem
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Bran
d
on
C
asey
notes
.
c: remo
v
e inapp
r
op
r
iat
e
call t
o
return
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Stephen Bo
y
d
pu
l
l:
r
eplace unnecessary sed
i
nvoc
a
t
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Junio C Hamano
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2010-03-17
Thomas
R
ast
D
o
cumen
t
ation
:
r
e
ceive
.
denyCurrentBranch def
a
ult
s
to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Ian W
a
rd Comfor
t
bash: co
m
plete
*
_
HEAD refs
i
f present
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Junio
C Hamano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2010-03-15
Michael
J
Gruber
Documentation/git-read-tree: clarify 2-tree merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-15
Michael J Gruber
Docu
m
e
ntation/git-read-tree: fix tab
l
e
layout
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-15
Juni
o
C Hamano
Merge branch 'sd/fo
r
m
a
t-
p
atc
h
-to'
commit
|
commitdiff
|
tree
2010-03-15
Junio C
H
a
m
ano
Merge bra
n
ch 't
c
/http-
c
l
e
anup'
commit
|
commitdiff
|
tree
2010-03-15
Junio
C Haman
o
Merge branch 'tc/transp
o
rt-verb
o
sit
y
'
commit
|
commitdiff
|
tree
2010-03-15
Junio C
Hamano
Me
r
ge b
r
an
c
h 'ld/push-p
o
rcelain'
commit
|
commitdiff
|
tree
2010-03-15
Ju
n
io C Hamano
Merg
e
br
a
n
ch 'jh/notes'
commit
|
commitdiff
|
tree
2010-03-14
Junio C Hamano
t
e
s
t
s fo
r
"git add igno
r
e
d-dir/fil
e
" witho
u
t -f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Jeff King
d
i
r
:
fi
x
COLL
E
CT_IGNORED on
excluded prefixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
J
unio C Ha
m
ano
t0050: mar
k
non-wo
r
k
ing test as s
u
ch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
J
uni
o
C
H
amano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-03-14
Dave Olszewski
d
o
n't use
d
efa
u
lt
r
evision if a rev wa
s
speci
f
ied
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
René S
c
harfe
for_each_recent_reflog_ent():
u
s
e
strbuf, fix
o
ffs
e
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Junio C Ha
m
ano
t/Makef
i
le: remo
v
e test artif
a
cts upo
n
"make cle
a
n"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
R
e
né Scharfe
bla
m
e: fix inden
t
of line numbers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Ju
n
io C
Haman
o
Merge
g
i
t://git
.
b
o
gomips
.
o
rg/git-
s
vn
commit
|
commitdiff
|
tree
2010-03-13
Junio C
H
amano
Merge b
r
a
nch '
m
a
i
nt'
commit
|
commitdiff
|
tree
2010-03-12
Junio C H
a
mano
t5516: Use test_cmp when appr
o
priate
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-12
Junio
C
H
am
a
n
o
t
9
400: U
s
e te
s
t_cmp when
a
ppropriate
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-10
Junio
C Hama
n
o
Merg
e
branch 'sd/ini
t
-temp
l
a
t
e
'
commit
|
commitdiff
|
tree
2010-03-10
Junio C
H
a
m
ano
Merge bra
n
ch 'sh/a
m
-keep-cr'
commit
|
commitdiff
|
tree
2010-03-10
Junio C Hamano
Mer
g
e branch
'c
p
/add-u-path
s
pec'
commit
|
commitdiff
|
tree
2010-03-10
Junio C
H
amano
Makef
i
le: update check-docs
t
a
rget
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-10
Junio C Ham
a
no
Merg
e
branch 'lt
/
d
e
epen-builtin-sou
r
ce'
commit
|
commitdiff
|
tree
2010-03-09
Jun
i
o
C
Hamano
Documen
t
atio
n
: improve description
o
f "git reset -
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
Stephen Boyd
s
end-emai
l
: ad
d
-
-
no-cc, -
-
no
-
to, and --no-bcc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
Ste
p
h
en
B
oyd
format-patch: add --no-cc, --no-to, and --no-add-h
e
aders
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
Stephen Boyd
f
ormat-patc
h
: us
e
a
s
tring_list for headers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
Ju
n
io
C H
a
mano
Upd
a
te draft releas
e
notes to 1
.
7
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Merge
b
r
anch 'm
a
int'
commit
|
commitdiff
|
tree
2010-03-08
Junio
C
Hamano
Merge accu
m
ulated fixes
t
o prepare for
1
.
7
.
0
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
Jun
i
o C Hama
n
o
Merge
b
ranch 'mw/maint-gcc-warn
s
-unused-w
r
ite' into
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
J
u
n
i
o C Hamano
M
erg
e
bra
n
ch '
f
n
/
maint-mkdtemp-
c
ompat' i
n
to maint
commit
|
commitdiff
|
tree
2010-03-08
J
u
nio C Ha
m
a
n
o
Merge branch 'gb
/
m
a
in
t
-submodul
e
-env' into
maint
commit
|
commitdiff
|
tree
2010-03-08
Junio
C Hamano
Mer
g
e bran
c
h 'as/maint-expire
'
into mai
n
t
commit
|
commitdiff
|
tree
2010-03-08
Junio C Haman
o
Merge
b
ran
c
h
'
ml
/
maint-gr
e
p-doc' in
t
o maint
commit
|
commitdiff
|
tree
2010-03-08
J
u
n
io C Ham
a
n
o
Merge branch
'jk/maint-push-tracki
n
g-
w
o-remote'
into
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Junio
C
H
a
mano
Merge br
a
nch 'jc/f
e
t
ch-pa
r
a
m
' into
m
aint
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Merge branch 'n
e
/pac
k
-local-d
o
c' into
maint
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Merge branch
'
jk/ma
i
nt-add--inte
r
a
ctive-delete' into
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Junio
C Ha
m
ano
M
e
r
g
e
bran
c
h 'mm/mk
s
temps-mode-for
-
p
a
ckfiles'
into
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Junio
C
Haman
o
Mer
g
e
b
ranc
h
'jc/m
a
int-fix-mailin
f
o-strip' into
maint
commit
|
commitdiff
|
tree
2010-03-08
Junio C H
a
mano
Merge branch 'jc/grep-author-all-match-implicit' into
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Junio C
H
amano
Merge branch 'jc/checkout-detached' into m
a
i
nt
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Merge bra
n
ch
'
maint-
1
.
6
.
6'
i
nto maint
commit
|
commitdiff
|
tree
2010-03-08
Mark Lod
a
to
grep
:
Colorize sel
e
cted, co
n
text, and function lines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
Mark Lod
a
to
grep: C
o
lorize filename, line nu
m
ber, and separa
t
or
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-07
Junio C H
a
mano
Merge
b
ranch 'jc/maint-fix
-
tes
t
-perm' into maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio
C
H
amano
Merge br
a
nc
h
'sp/maint-push
-
s
i
deba
n
d' into maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
J
unio C
H
ama
n
o
Merge bra
n
ch 'h
m
/maint-imap-s
e
nd-
c
rlf'
into
mai
n
t
-
1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
J
uni
o
C
H
amano
Merge
branch
'gf/mai
n
t-
s
h-setup-
n
ongit-ok'
i
nto maint
.
.
.
commit
|
commitdiff
|
tree
2010-03-07
J
u
n
i
o
C
Ha
m
ano
M
erge bra
n
ch 'jk/main
t
-
r
md
i
r-fix' into maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Me
r
g
e b
r
anch 'rs/optim
-
text-w
r
ap' into maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Merge branch 'tr
/
main
t
-cherry-pick-list
'
i
n
to ma
i
nt
.
.
.
commit
|
commitdiff
|
tree
2010-03-07
J
unio C Hamano
Merg
e
branch 'cc
/
maint-bis
e
ct-paths' into m
a
int-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Mer
g
e branch 'mw/
m
aint-gcc-w
a
rns-
u
nuse
d
-
w
rite'
commit
|
commitdiff
|
tree
2010-03-07
Junio
C
Hamano
Merge
b
ranch 'as/maint-ex
p
ire'
commit
|
commitdiff
|
tree
2010-03-07
J
u
nio C Hamano
Merge branch 'ml/
m
ai
n
t-grep-d
o
c'
commit
|
commitdiff
|
tree
2010-03-07
Jun
i
o C Hamano
Merge b
r
an
c
h 'fn/maint-mkdtemp-comp
a
t'
commit
|
commitdiff
|
tree
2010-03-07
Junio C H
a
mano
M
e
rg
e
br
a
nch
'gb/ma
i
nt-submodule-
e
nv
'
commit
|
commitdiff
|
tree
2010-03-07
Junio C H
a
m
a
no
Merge b
r
anch 'ne/pack-lo
c
al-
d
o
c
'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Haman
o
Merge branch 'mb/shortlog-nongit-stdin'
commit
|
commitdiff
|
tree
2010-03-07
J
u
nio C Hamano
Merg
e
b
r
anch '
j
k/mai
n
t-push-trackin
g
-wo
-
remote'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Ham
a
no
Merge br
a
n
c
h
'
j
c/fetch-param'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Mer
g
e bra
n
ch 'il/lo
o
sen-
r
emote-hel
p
er-names'
commit
|
commitdiff
|
tree
2010-03-07
Junio C H
a
ma
n
o
Merge branch 'nd
/
root-git'
commit
|
commitdiff
|
tree
2010-03-07
Junio C
Haman
o
Merge
branc
h
'
j
s/runtime-prefix-trace-not-
w
arn'
commit
|
commitdiff
|
tree
next