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
checkout --conflict=diff3: add a label for ancestor
2010-03-21
J
o
nat
h
an
N
ieder
checkout -
-
conflict=diff3: add a la
b
el for a
n
cestor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
ll_merge
(
): a
d
d ancestor
labe
l
p
ar
a
m
eter for di
f
f3
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
merge-f
i
le --d
i
ff3:
add a l
a
bel for ancestor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
han
Nieder
xdl_merge(): move f
i
le1 and file2 l
a
be
l
s
to xmparam
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
xdl_merge
(
): add opti
o
nal
ancestor la
b
e
l to d
i
ff3-s
t
yle
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
N
ie
d
er
tests: d
o
cument c
h
er
r
y-p
i
ck
b
e
havi
o
r
in face
o
f
conflicts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n Ni
e
d
e
r
t
ests:
d
ocument format of c
o
nflicts
f
r
o
m
c
heckout -m
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Upd
a
te draft
r
e
leas
e
notes to 1
.
7
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Junio C Ham
a
no
M
erge bra
n
ch '
j
k/maint-add-ignored-dir'
commit
|
commitdiff
|
tree
2010-03-20
Junio
C
Hamano
Me
r
ge bra
n
ch 'ml/c
o
lor-grep
'
commit
|
commitdiff
|
tree
2010-03-20
Junio
C
Hamano
Merge branch 'jc/color-attr
s
'
commit
|
commitdiff
|
tree
2010-03-20
Jun
i
o C Hamano
Merge br
a
nch 'cc/
r
eset-keep'
commit
|
commitdiff
|
tree
2010-03-20
Juni
o
C
Hamano
Merg
e
b
r
anch
'fl/askpass'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Merge branc
h
'bg/apply-fix-bla
n
k-at-eof'
commit
|
commitdiff
|
tree
2010-03-20
Junio C H
a
m
a
no
Merg
e
branch 'bw/union
-
me
r
ge
-
r
e
factor'
commit
|
commitdiff
|
tree
2010-03-20
Junio
C Hamano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2010-03-20
Jun
i
o C Hamano
Update
d
r
af
t
release
not
e
s
to 1
.
7
.
0
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
And
r
e
as
G
r
u
enbacher
fetch: Fix min
o
r m
e
mory l
e
a
k
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
A
n
dreas Gruenbac
h
e
r
fet
c
h:
Futur
e
-proof ini
t
i
alization of a refs
p
ec on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
A
n
d
reas G
r
uenbacher
fetch: Chec
k
for a
"^{
}
" suffix wit
h
suffixcmp()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Benjamin C Meye
r
Fix a
s
pelling m
i
stake in
a git-p4 console mes
s
age
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Br
i
an Gernhardt
Use
t
est_expe
c
t_s
u
ccess for test setups
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Imre Deak
daemo
n
:
pars
e
_host_and_port SIGSEGV
if
port
is specified
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan
N
i
eder
Makefile: Fix occa
s
ional GI
T
-
C
FLAGS breakag
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jonath
a
n
N
ieder
Mak
e
file: Fi
x
CDPATH
p
robl
e
m
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Bra
n
d
o
n
Casey
not
e
s
.
c: remove inapprop
r
iate call to retur
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Stephen Boyd
pull: r
e
p
lace un
n
eces
s
ary
sed
i
n
voca
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Junio C Hamano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2010-03-17
Thomas Rast
Documentati
o
n
: r
e
cei
v
e
.
denyCurr
e
n
tBranc
h
defaults to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Ia
n
Ward Comfort
bash: complete *
_
HEAD re
f
s if pr
e
s
ent
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Junio C Hamano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2010-03-15
Michael J Grub
e
r
Document
a
tion/git-read-tree: c
l
arify 2-t
r
e
e
merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-15
M
ichae
l
J Gruber
Do
c
umentation/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 branch 'sd/form
a
t
-
patch-to'
commit
|
commitdiff
|
tree
2010-03-15
J
u
nio C Hamano
Mer
g
e branch
'
tc/
h
ttp-cleanup'
commit
|
commitdiff
|
tree
2010-03-15
Jun
i
o
C
Hama
n
o
Merge
b
ranch 'tc/transport
-
ve
r
bosity'
commit
|
commitdiff
|
tree
2010-03-15
J
unio C Ham
a
n
o
Merge br
a
n
c
h 'ld/push-porcelain'
commit
|
commitdiff
|
tree
2010-03-15
Junio
C
H
amano
Me
r
ge
b
r
anc
h
'jh/
n
o
tes'
commit
|
commitdiff
|
tree
2010-03-14
Junio C Ha
m
ano
tests f
o
r
"
git
a
d
d
ignored-dir/file" without -
f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-14
J
eff King
d
i
r: fix CO
L
LECT_IGNORE
D
on excluded prefixes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-14
Junio C Haman
o
t0050: mark
n
on-working test as such
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-14
Junio C Hama
n
o
Mer
g
e b
r
anch 'maint'
commit
|
commitdiff
|
tree
2010-03-14
Dave Ol
s
zewski
don't use defaul
t
revision if a rev was
s
peci
f
ied
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Re
n
é Scharfe
for_each_
r
ecent_reflog
_
ent()
:
use
s
trbuf,
fix offset
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Junio
C Ham
a
n
o
t
/
Makefile: remov
e
test artif
a
c
ts up
o
n
"
ma
k
e clean"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
René S
c
harfe
b
lame: fix ind
e
n
t
o
f
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
.
o
r
g/git-svn
commit
|
commitdiff
|
tree
2010-03-13
Junio C Haman
o
M
erg
e
branc
h
'maint'
commit
|
commitdiff
|
tree
2010-03-12
Junio
C
Hamano
t
5
5
16: Use test_cmp when appropriate
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-12
J
u
ni
o
C Hamano
t94
0
0: Use test_cmp when approp
r
i
ate
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-10
Junio C Hamano
Merge branch 'sd/ini
t
-template
'
commit
|
commitdiff
|
tree
2010-03-10
Junio
C Ha
m
ano
Merg
e
branch 'sh/am-kee
p
-cr'
commit
|
commitdiff
|
tree
2010-03-10
Ju
n
i
o C
H
a
m
ano
Me
r
g
e
b
ranch 'cp/add-u-pathspec'
commit
|
commitdiff
|
tree
2010-03-10
Junio C Hama
n
o
Make
f
ile: update ch
e
ck-docs target
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-10
Junio C H
a
mano
Me
r
g
e
branch 'l
t
/deepe
n
-builtin-source'
commit
|
commitdiff
|
tree
2010-03-09
Junio C Haman
o
Docu
m
e
ntation
:
im
p
rov
e
de
s
cription of "git re
s
et -
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-08
Stephen Boyd
send-email: add -
-
no-cc, --no-to, and --no-
b
cc
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-08
S
tephe
n
Boyd
format-pa
t
c
h: ad
d
--no-cc, --no-to, and --no-add-headers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-08
Stephen Boy
d
format-pat
c
h
:
use a string_list for h
e
aders
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-08
Ju
n
io C
Hamano
U
p
da
t
e
dra
f
t r
e
l
e
ase notes to 1
.
7
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-08
Junio C
H
amano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2010-03-08
Junio C H
a
ma
n
o
Me
r
ge ac
c
umulate
d
fixes t
o
p
re
p
are for 1
.
7
.
0
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-08
Junio
C
Hamano
Merge branch 'mw/
m
aint-
g
cc-
w
arns-unused-
w
rite' into
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Jun
i
o
C Hamano
Merg
e
bra
n
c
h
'fn/maint-mkdtemp-compat
'
into maint
commit
|
commitdiff
|
tree
2010-03-08
Juni
o
C
Hamano
Merge branch 'gb/mai
n
t
-submodule-env' int
o
m
a
int
commit
|
commitdiff
|
tree
2010-03-08
Junio C Ha
m
ano
M
erge branch 'as/ma
i
nt-expir
e
'
i
nto maint
commit
|
commitdiff
|
tree
2010-03-08
J
u
n
i
o C Hamano
Merge branch 'ml/maint-grep-doc' in
t
o
m
a
int
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Merge bran
c
h '
j
k/maint-push-tracking-
w
o-remot
e
'
into
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
J
u
nio
C
Hamano
Merge br
a
n
c
h 'jc/fetch
-
param' into
maint
commit
|
commitdiff
|
tree
2010-03-08
Ju
n
io C Hamano
Merge bran
c
h 'ne/p
a
c
k
-local-doc'
i
nto
m
aint
commit
|
commitdiff
|
tree
2010-03-08
Junio C Haman
o
Me
r
ge branch 'jk/main
t
-
a
d
d--interactive
-
delete'
into
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Junio
C
Hamano
M
e
r
ge branch 'mm/mkstemps-mode-fo
r
-pa
c
kfiles' int
o
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Merge
branch 'j
c
/m
a
int-fi
x
-mailinfo-strip' i
n
to maint
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
M
erge bra
n
ch 'jc/g
r
ep-auth
o
r-all-match-imp
l
i
cit'
int
o
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Merge branch '
j
c/ch
e
ckout-detached' into maint
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Me
r
ge branch
'
ma
i
nt-1
.
6
.
6' into
maint
commit
|
commitdiff
|
tree
2010-03-08
M
a
rk Lodato
grep: C
o
lorize selected,
con
t
ext, and functio
n
lines
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-08
Mark Lodat
o
g
rep
:
Colorize filename,
line nu
m
b
e
r, and separator
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-07
J
unio C
Hamano
Merge bra
n
c
h 'jc/maint-fix-test-perm'
i
n
to maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Merge
bran
c
h 'sp/maint-push-sideband
'
into
m
ain
t
-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Juni
o
C Hama
n
o
M
erge branch
'hm/maint-ima
p
-se
n
d-crlf
'
into maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
J
u
nio C Hamano
Me
r
ge branch 'gf/maint-sh-se
t
up-nongit-ok' into maint
.
.
.
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Merge branch
'jk/maint-rmdir-fix'
i
nto maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
J
u
nio
C Hamano
Merg
e
branch 'rs/optim-t
e
xt-wrap' i
n
t
o maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
J
u
nio C Ham
a
no
Merge branch 'tr/
m
aint-ch
e
rry-pick-list' into m
a
in
t
.
.
.
commit
|
commitdiff
|
tree
2010-03-07
J
u
n
i
o
C
H
a
mano
Merge
b
ranch 'cc/maint-
b
isect-paths'
into maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Merge
b
ranch 'mw/ma
i
nt-
g
cc-warns-unused-write'
commit
|
commitdiff
|
tree
2010-03-07
Ju
n
io C
H
amano
Me
r
ge br
a
nch 'as/maint-expi
r
e'
commit
|
commitdiff
|
tree
2010-03-07
Juni
o
C Hamano
Mer
g
e branch 'ml/ma
i
nt-
g
r
ep-doc'
commit
|
commitdiff
|
tree
2010-03-07
Juni
o
C H
a
mano
Merge br
a
n
ch 'fn/maint-mkdtemp-compat'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Merge bran
c
h 'gb/main
t
-s
u
bmodule-env'
commit
|
commitdiff
|
tree
2010-03-07
J
unio
C
Hamano
Merge branch 'ne/pack-loca
l
-doc'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Ha
m
an
o
Merge b
r
anch '
m
b
/shortlog-nongit-stdin'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Merge branch 'jk/ma
i
nt-p
u
sh-trac
k
ing-w
o
-
remote'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
M
e
rge branc
h
'
jc
/
fet
c
h-param'
commit
|
commitdiff
|
tree
2010-03-07
Junio C H
a
mano
M
erg
e
branch
'
il/lo
o
s
e
n-remote-helper-names'
commit
|
commitdiff
|
tree
2010-03-07
J
u
ni
o
C
Ha
m
ano
Merge branch 'nd/root-gi
t
'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Merge br
a
nch 'js/ru
n
time-prefix-tr
a
ce-not-warn'
commit
|
commitdiff
|
tree
2010-03-07
J
u
nio C Ham
a
no
Merg
e
branch 'mm
/
mk
s
te
m
ps-mod
e
-for-
p
ac
k
files'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Merge b
r
anch 'jk/
m
a
int-
a
dd-
-
interac
t
ive-delete'
commit
|
commitdiff
|
tree
next