repo.or.cz
/
git
/
jrn.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
J
o
nat
h
an Nieder
rever
t
: clarify label
on con
f
li
c
t hunks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
athan
N
ieder
comp
a
t:
add memp
c
py()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
chec
k
out -
m
--
c
o
n
f
lict=diff3:
a
dd a
l
a
b
e
l
for
a
ncestor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
t
h
an Nie
d
er
m
e
rge_trees(): add anc
e
stor label parame
t
er for diff3
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
Nieder
merge_file():
a
dd co
m
m
ent explaining b
e
hav
i
or wrt
c
onfl
i
c
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Niede
r
checkout --conf
l
ict=diff
3
: a
d
d a label fo
r
ance
s
tor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Ni
e
de
r
ll_merge(): add ancesto
r
label
p
arameter for diff
3
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n
Nieder
mer
g
e-fi
l
e --diff3: add a label for ancest
o
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n Nie
d
er
xdl_merge(): move file1 and file2 lab
e
l
s to x
m
param
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
N
ieder
xd
l
_me
r
g
e(): add
o
ptional
a
ncestor lab
e
l to diff
3
-s
t
yl
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
tests: docu
m
e
nt cherry
-
pick behavior in face of conflicts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nat
h
an Nieder
tests
:
do
c
ument format of conflicts from
checkout -
m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Juni
o
C Hamano
U
pda
t
e draft r
e
lease notes
to 1
.
7
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Ju
n
io
C
H
am
a
no
Merge bran
c
h
'jk
/
maint-add-ignor
e
d-dir'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Ham
a
no
M
erge
bran
c
h 'ml/color-gre
p
'
commit
|
commitdiff
|
tree
2010-03-20
Junio
C Hamano
Merge
b
r
anch
'jc/color-attrs'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hama
n
o
Merg
e
b
ranc
h
'c
c
/
rese
t
-k
e
ep'
commit
|
commitdiff
|
tree
2010-03-20
Junio C
Hamano
Me
r
g
e
bran
c
h 'fl/ask
p
as
s
'
commit
|
commitdiff
|
tree
2010-03-20
Jun
i
o C Ham
a
no
Merge branch 'bg/apply-
f
i
x-bla
n
k-at
-
eof
'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Ha
m
ano
Merge bra
n
ch 'bw/uni
o
n-merge-refactor'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Merge
b
ranch 'maint
'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Update draf
t
r
elease notes to 1
.
7
.
0
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Andreas Gruenbacher
fetch:
Fix mi
n
o
r memory leak
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Andrea
s
Gruenba
c
her
fe
t
ch: Future-pr
o
o
f ini
t
ialization of a
refspe
c
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
And
r
eas Gruenbacher
fetc
h
:
C
heck for
a
"
^{}" suffix wit
h
s
u
ffi
x
cmp()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Benjamin C Meyer
Fix a spelling mista
k
e in a git-p4 c
o
nso
l
e mess
a
ge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Brian
G
ernhardt
Use test_expect_suc
c
ess for test setups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Imre
Deak
dae
m
o
n
:
pars
e
_host_and
_
port
S
I
GSEG
V
i
f
port is spec
i
fied
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Jo
n
athan Niede
r
M
a
kefil
e
: Fix occasion
a
l GIT-CFLAGS bre
a
kage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Jo
n
athan Nieder
Mak
e
f
i
le: Fix
CDPAT
H
problem
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Brandon Ca
s
ey
notes
.
c: remov
e
in
a
p
pr
o
priate call to re
t
urn
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Stephen B
o
yd
pull: replac
e
u
nneces
s
ary
s
ed i
n
voca
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Junio C
H
aman
o
M
e
rge br
a
nch
'm
a
i
nt'
commit
|
commitdiff
|
tree
2010-03-17
Thomas
R
ast
Doc
u
men
t
a
tion: receive
.
denyCurrentBranch defaults to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Ian Ward Comfort
bash: complete *_HE
A
D refs if present
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
J
u
nio C
H
a
ma
n
o
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-03-15
Michael J Gru
b
er
D
ocumen
t
at
i
on/gi
t
-re
a
d
-
tree: clarify 2-
t
ree mer
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-15
Michael J Gruber
Docume
n
tation
/
git-r
e
ad
-
t
ree:
f
ix
t
ab
l
e layout
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-15
Junio C Hamano
M
erg
e
bran
c
h
'sd/for
m
at-pa
t
ch-
t
o'
commit
|
commitdiff
|
tree
2010-03-15
Ju
n
io C Ha
m
ano
Merge branch 'tc/http
-
c
l
eanu
p
'
commit
|
commitdiff
|
tree
2010-03-15
Junio C Hamano
Merge branch
'tc/tr
a
nsport-verb
o
s
ity
'
commit
|
commitdiff
|
tree
2010-03-15
Junio
C
Hama
n
o
Me
r
g
e branch
'
ld/push-po
r
celain'
commit
|
commitdiff
|
tree
2010-03-15
Junio C Ha
m
a
n
o
Merge branch '
j
h/notes
'
commit
|
commitdiff
|
tree
2010-03-14
Jun
i
o
C
Hamano
t
e
s
ts for "git add
ign
o
r
e
d-dir/fil
e
" without -f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Jeff
K
ing
d
i
r: fix
C
OLLECT_
I
G
NORED on 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:
m
ark
non-working t
e
st
as such
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Juni
o
C
Haman
o
Merge
b
ranch '
m
ai
n
t'
commit
|
commitdiff
|
tree
2010-03-14
D
a
ve Olszews
k
i
d
o
n
'
t
u
se def
a
ult revis
i
on if a rev
w
a
s spec
i
f
i
ed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Ren
é
Sch
a
rfe
for_
e
ach_re
c
e
nt_r
e
flog_ent(): us
e
s
trb
u
f, f
i
x offset
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Juni
o
C Haman
o
t/Makefile
:
remove test artifa
c
ts upon "ma
k
e
c
l
ea
n
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Ren
é
Scharfe
blame: fix indent
of line num
b
ers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Junio C
H
amano
M
erge git://git
.
bogomips
.
org/git
-
s
v
n
commit
|
commitdiff
|
tree
2010-03-13
J
uni
o
C Ham
a
no
M
e
rge br
a
nc
h
'maint'
commit
|
commitdiff
|
tree
2010-03-12
Junio C Hamano
t5516
:
Use test
_
cm
p
w
h
en app
r
opriate
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-12
J
u
nio C H
a
mano
t94
0
0:
U
s
e t
e
st
_
c
m
p when
a
ppro
p
riat
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-10
Ju
n
i
o
C Hamano
M
erge br
a
nch 'sd
/
init-template'
commit
|
commitdiff
|
tree
2010-03-10
Junio C H
a
mano
Merge branc
h
'
s
h/am-keep-cr'
commit
|
commitdiff
|
tree
2010-03-10
J
u
nio C
Ham
a
no
Merg
e
bra
n
ch '
c
p/add-u-path
s
pec'
commit
|
commitdiff
|
tree
2010-03-10
Junio C Hamano
M
a
kefil
e
: u
p
da
t
e che
c
k-docs t
a
rget
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-10
Juni
o
C
Hamano
M
e
rge b
r
a
nch 'lt/deep
e
n-builtin-source'
commit
|
commitdiff
|
tree
2010-03-09
Jun
i
o C Hamano
Docu
m
entat
i
o
n
:
imp
r
ove description of "git res
e
t -
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
Stephen Boyd
s
end-email
:
add --no-
c
c,
--no-to, and --no-bcc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
Stephen Boyd
format-patch: add --n
o
-cc, --n
o
-to, and --no-add-headers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
Stephe
n
B
oyd
format-patch: use a strin
g
_list for he
a
ders
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
J
u
nio C
H
amano
Up
d
ate draft re
l
ease notes to
1
.
7
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Merge accumulated fixes to
p
r
e
pare f
o
r
1
.
7
.
0
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
Jun
i
o C Ham
a
no
Merg
e
bra
n
ch 'mw/maint-
g
c
c-warns-u
n
u
s
e
d
-writ
e
'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Junio
C
H
amano
Merge branch
'
fn/
m
aint-mkd
t
emp-compat' into
m
aint
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Merge branch 'gb/maint-
s
ubmo
d
u
l
e-
e
nv' into ma
i
nt
commit
|
commitdiff
|
tree
2010-03-08
Junio C Ha
m
ano
Merge
branch 'as/maint-expire
'
into maint
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
M
e
r
g
e
branch 'ml/maint-g
r
e
p-doc'
into
maint
commit
|
commitdiff
|
tree
2010-03-08
Junio C H
a
mano
Merge
br
a
nch 'jk/maint-push-tracking
-
w
o
-remote' into
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Junio C H
a
mano
M
erge bran
c
h '
j
c
/
f
e
tch
-
p
a
r
am'
i
nt
o
maint
commit
|
commitdiff
|
tree
2010-03-08
J
u
ni
o
C H
a
mano
Merge b
r
a
nch
'ne/pack-local-doc' int
o
m
a
int
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Merg
e
branch 'jk/maint-add--
i
nteractive-delet
e
' into
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Junio
C Hamano
Mer
g
e branch 'mm/mkstemps-mode
-
f
o
r-pa
c
kfiles
'
int
o
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Junio C H
a
mano
Merge branch 'jc/ma
i
n
t-fix-mailinfo-stri
p
'
into maint
commit
|
commitdiff
|
tree
2010-03-08
Ju
n
io C Hamano
Merge bra
n
ch 'jc/grep-aut
h
or
-
all-m
a
t
c
h-implicit'
i
nt
o
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Jun
i
o C Hamano
Me
r
ge branch 'jc/che
c
kout-
d
etached
'
into maint
commit
|
commitdiff
|
tree
2010-03-08
J
unio C Hamano
Merge branc
h
'maint-1
.
6
.
6' into mai
n
t
commit
|
commitdiff
|
tree
2010-03-08
Mark Lodato
grep: Color
i
ze selected, conte
x
t, and
function line
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
Mar
k
Lodato
grep: Colorize
f
ilename, line number, and
se
p
arator
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
M
e
rge branch 'jc/
m
a
i
nt-fix-
t
est
-
per
m
' in
t
o maint
-
1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio C H
a
mano
Merge branch
'
sp/maint-p
u
sh
-
sideband' into
maint
-
1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
J
u
nio
C
Hamano
Merge bra
n
ch 'hm/maint-imap-s
e
nd-crlf' into maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio C
Ham
a
n
o
Merge branch 'gf/maint-sh-setup-nongit
-
ok' into maint
.
.
.
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Me
r
ge br
a
n
c
h
'
j
k
/
m
a
int-rmdir-fix' into maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Merge
b
ranch 'rs/opti
m
-t
e
x
t-wra
p
' into maint
-
1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Jun
i
o C
Hamano
Merge branch 'tr
/
maint-cherry-
p
i
c
k
-
list'
i
n
t
o ma
i
nt
.
.
.
commit
|
commitdiff
|
tree
2010-03-07
Junio
C H
a
m
ano
Mer
g
e branch
'
cc/m
a
i
n
t-bisect
-
pat
h
s' into maint-
1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Mer
g
e
branch 'mw/m
a
i
n
t-gcc-warns
-
unuse
d
-write'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Merge
b
r
a
nch 'as/main
t
-expire'
commit
|
commitdiff
|
tree
2010-03-07
Ju
n
i
o
C Hamano
Me
r
g
e
branch
'ml/maint-grep-doc'
commit
|
commitdiff
|
tree
2010-03-07
Junio
C Hamano
M
erge branch
'
fn/maint-mkdtemp-
c
ompat'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Merge branc
h
'g
b
/maint-submodule-e
n
v'
commit
|
commitdiff
|
tree
2010-03-07
Junio
C Hamano
Merge bra
n
ch 'ne/pack-local-doc'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
M
e
rge branch
'
mb/shortlog-nongi
t
-
s
tdin'
commit
|
commitdiff
|
tree
2010-03-07
Junio C
H
ama
n
o
Merge branch 'jk/maint-
p
ush-tracking-wo-re
m
o
t
e'
commit
|
commitdiff
|
tree
2010-03-07
Juni
o
C
H
a
man
o
Merge br
a
nch 'jc/f
e
tch-p
a
ram'
commit
|
commitdiff
|
tree
next