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
ll_merge(): add ancestor label parameter for diff3-style output
2010-03-21
Jonathan Nieder
l
l_m
e
rge(): add
ancestor label pa
r
amet
e
r
for
diff3
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
m
erge-file --diff3: add a label for ancestor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
xdl_mer
g
e():
m
ove file1
and file2 labels to
x
mp
a
ram
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n Nie
d
er
xdl_merge
(
):
a
dd optio
n
al ances
t
or label to diff3-style
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n Nieder
tests: d
o
cument c
h
erry
-
pick
b
ehav
i
or in face of conf
l
ict
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
tests: do
c
u
ment format
o
f conflicts from checkout -m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Jun
i
o C
Hamano
Updat
e
draft release not
e
s
to 1
.
7
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Merge br
a
nch 'jk/maint-add-ignore
d
-dir'
commit
|
commitdiff
|
tree
2010-03-20
Junio C
Ham
a
no
Me
r
g
e branch 'ml/
c
olor-grep'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Me
r
ge branch 'jc/
c
olor-attrs'
commit
|
commitdiff
|
tree
2010-03-20
J
u
n
io C H
a
mano
Merge branch 'cc/reset-keep'
commit
|
commitdiff
|
tree
2010-03-20
Junio C
Hamano
Merge
branc
h
'fl/askpass'
commit
|
commitdiff
|
tree
2010-03-20
Ju
n
io C Hamano
M
erg
e
branch
'
bg/apply-fix-bl
a
n
k
-at-eof'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Merge branch 'bw/union-merge-r
e
factor'
commit
|
commitdiff
|
tree
2010-03-20
Juni
o
C Hama
n
o
Merge br
a
nc
h
'm
a
int'
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
Andreas Gruenbacher
fetc
h
:
Fix min
o
r memory
l
e
ak
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
And
r
eas
Gru
e
n
bacher
fetch
:
Future-proof initializatio
n
of
a
re
f
spec
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Andreas Gruenb
a
c
h
e
r
fetch
:
Check for a
"
^{}"
suffix w
i
t
h
s
u
f
fixcmp()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
B
e
n
j
amin C Meyer
Fix a spelli
n
g
mis
t
ake
in a git-p4
con
s
ole mess
a
ge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Brian Ger
n
har
d
t
Use test_ex
p
ect_succ
e
ss f
o
r test setups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
I
mre Deak
daemon: parse_hos
t
_and
_
po
r
t SIGSEGV
if
port is
specified
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan Niede
r
Makefile
:
Fix occ
a
si
o
nal GIT-CFLAGS brea
k
age
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan Ni
e
der
Makefile: Fix CDPATH problem
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Br
a
n
d
o
n
Casey
notes
.
c: remo
v
e
i
napprop
r
iate ca
l
l to r
e
turn
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
St
e
phen Boyd
pul
l
:
replace unnec
e
ssary sed
i
nvo
c
ation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Junio C Hamano
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2010-03-17
T
h
oma
s
Rast
Docu
m
entation
:
receiv
e
.
d
e
nyCurr
e
ntBranch de
f
aults to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Ian Ward
Comfort
bash
:
complete *_HEAD refs if present
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Jun
i
o
C Hamano
M
e
r
ge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2010-03-15
Micha
e
l J Gru
b
er
D
ocumentation/git-read-tree:
cl
a
rify 2-tree mer
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-15
Michael J Grub
e
r
Documentation/git-read-tree:
f
ix
table la
y
out
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-15
Junio C Hamano
Me
r
g
e
branch 'sd/format-patch-to'
commit
|
commitdiff
|
tree
2010-03-15
Ju
n
io C Hamano
Mer
g
e
branch 'tc/http-cleanup'
commit
|
commitdiff
|
tree
2010-03-15
Junio C Ha
m
ano
Merge branch 'tc/tra
n
s
p
o
r
t
-verbosity'
commit
|
commitdiff
|
tree
2010-03-15
Juni
o
C
Hamano
Merge branch 'ld/push-porcelain'
commit
|
commitdiff
|
tree
2010-03-15
Jun
i
o C Ham
a
no
Merge branch 'jh/notes'
commit
|
commitdiff
|
tree
2010-03-14
Junio C H
a
mano
te
s
t
s f
o
r "git add ig
n
ored-dir/file" withou
t
-f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
J
e
ff King
dir: fix COLLECT
_
IG
N
O
R
ED
o
n ex
c
lu
d
ed pref
i
x
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
J
u
n
i
o
C Ha
m
ano
t
0
050:
m
ark non-working test as s
u
ch
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Juni
o
C Hamano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2010-03-14
D
a
ve
Olszewsk
i
don't
u
s
e d
e
fa
u
lt revisi
o
n if a rev was speci
f
ie
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
René Scharfe
for_each
_
recent_reflog
_
ent(): use strbuf, fix offset
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Junio C Hamano
t/Mak
e
file: remove test artifac
t
s upon
"
make c
l
ea
n
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
René
S
charfe
blame:
f
i
x
indent
of li
n
e
numbers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Junio C Ham
a
n
o
Me
r
ge
g
it://git
.
bog
o
mips
.
org/git-svn
commit
|
commitdiff
|
tree
2010-03-13
Ju
n
io C
H
amano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2010-03-12
Junio
C Hama
n
o
t5516
:
Us
e
t
est_cmp
w
hen ap
p
rop
r
iate
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-12
Junio C Hamano
t9400:
U
se test_cmp
w
h
e
n appropriate
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-10
Junio C Hamano
M
er
g
e branch 'sd/init-template'
commit
|
commitdiff
|
tree
2010-03-10
Junio C Hamano
M
e
rge
branch '
s
h
/
am-keep-cr'
commit
|
commitdiff
|
tree
2010-03-10
Junio
C Hamano
Merge
b
ranch 'cp
/
add
-
u-pa
t
hs
p
ec'
commit
|
commitdiff
|
tree
2010-03-10
J
un
i
o C
Hamano
M
a
kefile
:
up
d
at
e
che
c
k
-docs t
a
r
get
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-10
Junio C Hamano
Merge branch '
l
t
/
deepen-builtin-source'
commit
|
commitdiff
|
tree
2010-03-09
J
u
n
io C Hamano
Docu
m
e
n
t
a
tion: improv
e
d
escription of "git re
s
et -
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
Step
h
en Boyd
send-em
a
il: add
-
-no-
c
c,
-
-no-to,
a
nd --n
o
-bc
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
Stephe
n
Boyd
format-
p
atch: add --no-
c
c
,
-
-
no-to, and --no-
a
dd
-
headers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
Stephen Boyd
format-patch: use a
st
r
i
n
g_l
i
st for headers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
Ju
n
i
o
C
Hamano
Upd
a
te dra
f
t
r
e
lease
n
ote
s
to
1
.
7
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
J
un
i
o
C
Hamano
Merge bra
n
ch
'
m
a
i
n
t'
commit
|
commitdiff
|
tree
2010-03-08
J
u
nio C
H
ama
n
o
Merge accumu
l
ated fixes
to prepare for 1
.
7
.
0
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hama
n
o
Merg
e
br
a
nch '
m
w/maint-gcc
-
war
n
s-unused-write'
int
o
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Junio C Haman
o
Merge branch '
f
n/maint
-
mkdtemp-com
p
at' into maint
commit
|
commitdiff
|
tree
2010-03-08
Ju
n
io C Hama
n
o
Merge
branch 'gb/maint-submodule-
e
nv' into maint
commit
|
commitdiff
|
tree
2010-03-08
Jun
i
o C Hamano
Merge
branch 'as/maint-expire' into main
t
commit
|
commitdiff
|
tree
2010-03-08
Junio C Ha
m
ano
Merge branch 'ml/maint-gr
e
p-doc' into maint
commit
|
commitdiff
|
tree
2010-03-08
Junio C Ham
a
n
o
Merge bra
n
ch '
j
k/maint-push-tracking-wo-remote' into
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Junio C
Hamano
Merge bran
c
h 'jc/fetc
h
-param
'
into mai
n
t
commit
|
commitdiff
|
tree
2010-03-08
Junio C Ha
m
ano
M
er
g
e
b
ranch '
n
e/pack-local-do
c
' into maint
commit
|
commitdiff
|
tree
2010-03-08
Junio
C Hamano
Merge
b
r
a
nch 'jk/
m
aint-
a
dd--i
n
t
eractive-delete
'
into
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
J
u
nio C Hamano
Merge br
a
nc
h
'mm/mkstemps-mode-for-packfi
l
es' into
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Junio C H
a
mano
Merge
b
ranch 'jc/maint-fix-mailinfo-strip' int
o
maint
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Merg
e
branch 'j
c
/gre
p
-author-all-match-implici
t
' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
M
e
r
ge branch 'jc
/
checkout-detached' in
t
o maint
commit
|
commitdiff
|
tree
2010-03-08
J
unio C
H
amano
M
erge branch 'maint-1
.
6
.
6' into m
a
int
commit
|
commitdiff
|
tree
2010-03-08
Mark L
o
dato
g
rep: Colori
z
e
s
elected, c
o
ntext,
a
nd function l
i
nes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
M
ark Lodat
o
grep: Co
l
orize fi
l
e
name, line number, an
d
separator
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-07
Junio C Ham
a
no
Me
r
ge branch 'jc/maint-f
i
x-test-perm' into maint-
1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hama
n
o
Merge br
a
nch 'sp/maint-push-s
i
d
e
band' into ma
i
nt-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
M
e
rge
b
r
anch '
h
m/mai
n
t-
i
map
-
send-crlf' i
n
to maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio
C
Hama
n
o
Merge branch 'gf/maint-sh-setup-nongit-ok' into maint
.
.
.
commit
|
commitdiff
|
tree
2010-03-07
J
unio C H
a
ma
n
o
Merge branch 'jk/maint-rmd
i
r
-fix' into m
a
in
t
-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
J
u
nio C Hamano
M
e
rge
b
ranch '
r
s/optim-text
-
wrap
'
i
nto m
a
int-
1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio
C
Hamano
M
erge branch 'tr/maint-cherry-pick-list' into ma
i
nt
.
.
.
commit
|
commitdiff
|
tree
2010-03-07
J
unio C Hamano
Merge branch 'cc/maint-
b
isec
t
-paths' into maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Jun
i
o C
H
amano
Merge bran
c
h 'mw
/
ma
i
nt-g
c
c-warns-unu
s
e
d
-
write'
commit
|
commitdiff
|
tree
2010-03-07
Junio
C
Hamano
Mer
g
e branch 'as/maint-expire'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Merg
e
branch 'ml/maint-
g
rep-doc'
commit
|
commitdiff
|
tree
2010-03-07
Junio
C
Haman
o
Merge branch '
f
n/maint-mk
d
t
e
m
p-compat'
commit
|
commitdiff
|
tree
2010-03-07
J
unio
C H
a
m
a
n
o
Merge branch 'gb/main
t
-submodule
-
env'
commit
|
commitdiff
|
tree
2010-03-07
Junio
C
H
amano
M
er
g
e bran
c
h 'ne
/
pac
k
-
local-doc'
commit
|
commitdiff
|
tree
2010-03-07
Jun
i
o
C
Hamano
Merg
e
branch
'
mb/
s
h
or
t
log-nong
i
t-stdin'
commit
|
commitdiff
|
tree
2010-03-07
Juni
o
C Hamano
Merge
b
ranch 'jk/maint-push-tracking-wo-r
e
mote'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hama
n
o
Mer
g
e branch 'jc/fetch-param'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Merge bra
n
ch 'il/lo
o
sen-remote-helper-n
a
mes'
commit
|
commitdiff
|
tree
2010-03-07
Junio C
Ha
m
ano
M
e
r
g
e b
r
anch '
n
d/root-gi
t
'
commit
|
commitdiff
|
tree
2010-03-07
Ju
n
io C
Hamano
Me
r
ge bra
n
ch
'
js/runtime
-
pre
f
i
x
-
t
r
ace-not-war
n
'
commit
|
commitdiff
|
tree
2010-03-07
Junio C
Hamano
Merg
e
b
r
a
n
ch 'mm/mkstemps-mod
e
-for-pa
c
kfiles'
commit
|
commitdiff
|
tree
2010-03-07
Juni
o
C
Ha
m
ano
Merge branch
'jk/maint-add--interac
t
ive-delete'
commit
|
commitdiff
|
tree
2010-03-07
Junio
C
Hamano
M
erge branch 'jc
/
maint-fix-ma
i
l
i
nfo-strip'
commit
|
commitdiff
|
tree
next