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
Jonathan N
i
eder
c
heckout --conflic
t
=diff3:
ad
d
a
label f
o
r ancestor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nathan Nie
d
e
r
ll_merge(): add ancestor label parameter for
diff3
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Ni
e
der
merg
e
-
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(): mov
e
file1 and file2 labels to xmpar
a
m
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
Nieder
xdl_merge(): add optional ancestor label to di
f
f3-st
y
le
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
J
onatha
n
Nieder
tests: document cherry
-
p
i
ck behavior in face of
conflic
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n Nieder
tes
t
s: docu
m
ent f
o
rmat of confli
c
ts from checkout
-
m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Junio
C
Hamano
Update draft
r
elease
notes to
1
.
7
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Junio C
H
amano
Merge
b
r
a
nch 'jk/m
a
in
t
-
a
dd-ignored-dir'
commit
|
commitdiff
|
tree
2010-03-20
Ju
n
io C Hamano
Merge branch 'ml/colo
r
-
g
rep'
commit
|
commitdiff
|
tree
2010-03-20
Jun
i
o
C
Ha
m
ano
Merge branch 'jc/color-attrs'
commit
|
commitdiff
|
tree
2010-03-20
Junio C
H
amano
Merge branch
'
cc/r
e
s
e
t-keep
'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Merge branch 'fl/as
k
pass'
commit
|
commitdiff
|
tree
2010-03-20
Jun
i
o C H
a
mano
Mer
g
e branch
'
bg/apply-fix-bla
n
k-at
-
eof'
commit
|
commitdiff
|
tree
2010-03-20
Junio
C
H
a
mano
M
e
rge branch 'bw/uni
o
n-
m
erge-
r
efact
o
r'
commit
|
commitdiff
|
tree
2010-03-20
J
unio C Haman
o
Merge
b
ra
n
ch '
m
aint'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Upd
a
te draft release no
t
es t
o
1
.
7
.
0
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Andrea
s
Gruenbac
h
er
fetch: Fix minor
m
emory leak
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Andreas G
r
uenb
a
ch
e
r
fetch: Future-pr
o
of ini
t
i
alization of
a ref
s
pec on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
An
d
reas
G
ruenb
a
cher
fetch: Check for
a "^{}" su
f
fix with su
f
fixcmp()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Benjam
i
n
C Meyer
F
ix a spelli
n
g mistake in
a
git-p4 co
n
sole messa
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Brian G
e
r
n
hardt
Use test_expect_success for test
s
etups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Imre Deak
dae
m
on: par
s
e_hos
t
_
a
nd_po
r
t S
I
GSE
G
V if
p
ort is sp
e
cifi
e
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
J
o
nathan
N
i
e
d
e
r
Makefile: Fix occ
a
siona
l
G
IT-CFLAGS
b
r
eakage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
J
o
nath
a
n Nieder
Makefi
l
e: Fix CDPATH p
r
oblem
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Brandon Casey
note
s
.
c
:
remove inappropriate call to
r
eturn
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
S
t
e
phen Boyd
pull:
replace unnecessary sed in
v
oca
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Jun
i
o
C
Ha
m
a
n
o
Me
r
ge b
r
anch 'main
t
'
commit
|
commitdiff
|
tree
2010-03-17
Thomas
Ra
s
t
Docu
m
entation: receive
.
denyCurrentBranch
d
e
f
a
ult
s
to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Ian Wa
r
d Comfort
bash: comp
l
et
e
*_HEAD refs
if
pr
e
s
ent
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
J
u
nio C
Ha
m
ano
Merg
e
br
a
nch 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-03-15
Michael
J
G
r
u
ber
Doc
u
mentation/git-read-tree: clarify 2-t
r
e
e
mer
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-15
Michael J Gruber
D
ocum
e
ntation/gi
t
-read-tree: fix
t
a
b
le layout
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-15
Junio
C
Hamano
M
e
rge bra
n
ch '
s
d/format-patch-to'
commit
|
commitdiff
|
tree
2010-03-15
Jun
i
o C
Haman
o
Merge branch 'tc/http
-
cle
a
nup'
commit
|
commitdiff
|
tree
2010-03-15
Junio C Hamano
Merge branch '
t
c/transport-verbosity'
commit
|
commitdiff
|
tree
2010-03-15
J
un
i
o C Hamano
Merge br
a
nch 'ld/push-porcelain'
commit
|
commitdiff
|
tree
2010-03-15
Ju
n
i
o
C Hamano
M
e
rge bra
n
ch 'j
h
/notes'
commit
|
commitdiff
|
tree
2010-03-14
Junio
C
H
a
mano
t
ests f
o
r "
g
it
a
d
d
ig
n
ored-dir/fi
l
e" w
i
thout -f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Jeff King
dir
:
fix C
O
LLECT_IGNORED
o
n excluded prefixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Junio
C
H
a
mano
t0050:
m
ark
non-worki
n
g test as such
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
J
unio C Hama
n
o
M
erge branc
h
'ma
i
n
t'
commit
|
commitdiff
|
tree
2010-03-14
D
av
e
Olszew
s
ki
don't use
def
a
ult
revisi
o
n if
a rev was s
p
ecifi
e
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
René Schar
f
e
f
o
r_
e
ach_re
c
ent_reflog_ent(): u
s
e strbuf
,
fix
offset
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Jun
i
o C Hamano
t/Makefile: rem
o
ve te
s
t arti
f
acts upon
"make clean"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
René Scharf
e
blame: fix indent of line numbers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Ju
n
io
C Hamano
M
e
rge git://git
.
bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2010-03-13
Junio C H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-03-12
Junio C Hamano
t5516:
U
se tes
t
_
c
mp whe
n
appropriate
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-12
Junio C
H
amano
t9400: Use test_cmp when appropriate
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-10
Junio
C
Hamano
Merge bra
n
ch 'sd/init-
t
emp
l
ate'
commit
|
commitdiff
|
tree
2010-03-10
Ju
n
io C Ha
m
ano
Merg
e
branch
'sh/am
-
keep-cr'
commit
|
commitdiff
|
tree
2010-03-10
Junio C Ham
a
n
o
Merg
e
branch 'cp
/
add-u-
p
athspec'
commit
|
commitdiff
|
tree
2010-03-10
J
uni
o
C H
a
m
a
no
Makefile: updat
e
ch
e
ck-docs target
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-10
Junio C
H
a
ma
n
o
Merg
e
b
r
anch 'lt/dee
p
en-builtin-s
o
urce'
commit
|
commitdiff
|
tree
2010-03-09
J
u
nio C Hamano
Do
c
umentation: improve description of "git reset -
.
.
.
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
-
-
n
o
-bcc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
Stephen Boyd
format-patch: add --no-cc, --no-to, and --no-add-he
a
ders
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
Step
h
e
n
Boyd
format-p
a
tc
h
: use
a strin
g
_lis
t
for headers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
Ju
n
i
o C Haman
o
Update draft rele
a
se notes t
o
1
.
7
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
Ju
n
io C
Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2010-03-08
J
u
nio C
H
amano
Merge accumulated f
i
x
e
s
to prep
a
re for 1
.
7
.
0
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
Junio
C
Hamano
Merge
b
ranch
'
mw/maint-
g
cc-warns-unuse
d
-write' into
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Merg
e
branch
'fn/maint-m
k
d
t
e
mp-comp
a
t
'
into maint
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
M
e
r
g
e
b
ranch 'gb/
m
ai
n
t-s
u
bmodule
-
env' in
t
o
maint
commit
|
commitdiff
|
tree
2010-03-08
Junio C H
a
mano
Merge bra
n
c
h
'
a
s/mai
n
t-expire' into mai
n
t
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Merge b
r
anch
'ml/
m
aint-grep-doc' i
n
to m
a
int
commit
|
commitdiff
|
tree
2010-03-08
J
un
i
o C Hamano
Merge branc
h
'jk/
m
aint-push-tr
a
cking
-
wo-remote' int
o
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Ju
n
i
o C Hamano
Me
r
ge branch 'jc/fet
c
h-param' into maint
commit
|
commitdiff
|
tree
2010-03-08
Junio
C Hamano
M
er
g
e branch 'ne/pack-local-do
c
' into maint
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Merge
b
ranch 'j
k
/maint-add--intera
c
tive-delet
e
' i
n
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Junio C Haman
o
Merge branch
'mm/m
k
stemps-
m
ode-f
o
r-
p
a
ckfiles' into
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Junio
C
Haman
o
Merge branch 'jc/maint
-
fix-mailinfo-s
t
rip' into ma
i
nt
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
M
e
r
ge branch 'jc/grep-author-al
l
-match-imp
l
i
c
it
'
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Junio C
H
amano
Me
r
g
e
br
a
nch 'jc/ch
e
ckout-detached
'
into
ma
i
n
t
commit
|
commitdiff
|
tree
2010-03-08
J
u
nio C Hamano
Mer
g
e branch 'maint-1
.
6
.
6'
i
n
to maint
commit
|
commitdiff
|
tree
2010-03-08
Mark
Lodato
grep: Colo
r
iz
e
select
e
d,
c
o
ntext, and function lines
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
Mark Lodato
grep: Colo
r
ize
fi
l
e
n
ame,
li
n
e number, and separa
t
or
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-07
J
unio C Hamano
M
erge bran
c
h
'jc/ma
i
nt-fix-t
e
s
t
-
p
erm
'
into maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio
C H
a
mano
Merge branch 'sp/maint-pus
h
-sideband' into maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
J
unio C H
a
mano
Mer
g
e
b
ra
n
ch 'hm/ma
i
nt-
i
map-s
e
nd-crlf'
i
nto maint-
1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio C H
a
m
a
no
Me
r
g
e
b
r
anch
'gf/
m
ain
t
-sh-se
t
u
p-nongit-ok' i
n
t
o maint
.
.
.
commit
|
commitdiff
|
tree
2010-03-07
J
u
nio
C
Hamano
Me
r
ge branch 'jk/maint-rmdir-fix'
i
nto maint
-
1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
J
u
n
io C Ham
a
no
M
e
rge
branch 'rs/o
p
tim-t
e
xt-wrap' in
t
o maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Merge branch 'tr/maint-cherry
-
p
i
ck
-
list' into mai
n
t
.
.
.
commit
|
commitdiff
|
tree
2010-03-07
Junio C Haman
o
Merge
branch 'c
c
/mai
n
t-bisect-paths' into maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio
C Ha
m
a
no
Merge branch 'mw/maint-gcc-
w
arns-unused
-
write'
commit
|
commitdiff
|
tree
2010-03-07
Juni
o
C Hamano
M
e
rge branch 'as/mai
n
t-exp
i
re'
commit
|
commitdiff
|
tree
2010-03-07
Junio C H
a
man
o
Merge bran
c
h 'ml/mai
n
t-grep-d
o
c'
commit
|
commitdiff
|
tree
2010-03-07
Juni
o
C H
a
m
a
n
o
Merge branch 'f
n
/mai
n
t-mkd
t
e
m
p-compat'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Merge
b
ranch
'
gb/maint-
s
ubmodul
e
-
e
nv'
commit
|
commitdiff
|
tree
2010-03-07
Juni
o
C Hamano
Merge branch 'ne/pa
c
k
-
local-do
c
'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hama
n
o
Merg
e
branch 'mb/shor
t
log
-
nongit-stdin'
commit
|
commitdiff
|
tree
2010-03-07
J
unio C
Ha
m
an
o
M
e
r
ge bran
c
h 'jk/
m
aint-push-track
i
ng-
w
o-remote'
commit
|
commitdiff
|
tree
2010-03-07
J
unio C Ha
m
ano
Merge branch 'j
c
/fetch-param'
commit
|
commitdiff
|
tree
2010-03-07
Juni
o
C Ha
m
a
n
o
Merge b
r
anch '
i
l/loosen-remote-helper-names'
commit
|
commitdiff
|
tree
2010-03-07
Juni
o
C Hamano
Merge branc
h
'nd/
r
oot-git'
commit
|
commitdiff
|
tree
2010-03-07
Junio C H
a
mano
Merge branch 'js/
r
untime-
p
r
e
fix-trace-
n
ot-warn
'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Ham
a
no
Merge branch 'mm/mkstemps-m
o
d
e
-for-packfiles'
commit
|
commitdiff
|
tree
2010-03-07
Juni
o
C Hamano
Merg
e
branch
'jk/m
a
i
n
t-
a
dd--int
e
r
active-
d
elete
'
commit
|
commitdiff
|
tree
next