repo.or.cz
/
git
/
wpalmer.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
checkout -m --conflict=diff3: add a label for ancestor
2010-03-21
Jonathan
Nieder
checkou
t
-m --conflic
t
=
di
f
f3:
a
dd
a label for ancesto
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan Nieder
merg
e
_trees():
a
dd ance
s
tor label parameter
f
o
r
diff3
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
athan N
i
eder
merge_file(
)
: add comment explaini
n
g behavior wrt conflict
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nat
h
an N
i
eder
c
heckout --conflict=diff3: add a label f
o
r ancestor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
at
h
an Nieder
ll_m
e
r
g
e(
)
:
a
d
d
ancest
o
r label
p
aramete
r
for
d
iff3
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n Nieder
merge-fil
e
--d
i
f
f3: add a lab
e
l for ancestor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
natha
n
N
i
eder
xd
l
_merge(): move fil
e
1 and file
2
l
a
bels to
x
m
p
a
r
a
m
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
n
a
than
N
i
ed
e
r
xdl_
m
erge(): add opti
o
nal ances
t
or labe
l
t
o
diff3-st
y
le
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan Nieder
tests: document
c
herry-pick behavior in face of confli
c
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
tests: d
o
cume
n
t format
o
f conflicts
f
rom checkou
t
-
m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Upd
a
t
e d
r
aft rele
a
s
e notes
t
o
1
.
7
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Juni
o
C Hamano
M
e
rge
b
r
a
nch 'jk/mai
n
t-add-ignored-dir'
commit
|
commitdiff
|
tree
2010-03-20
Junio C
Hamano
Merge branch 'm
l
/color-grep'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Mer
g
e branch
'jc/color-attrs'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Merge branch
'cc/re
s
e
t-keep
'
commit
|
commitdiff
|
tree
2010-03-20
Junio
C Haman
o
Merge branch 'fl/askpass'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hama
n
o
Merg
e
b
ranch 'bg/ap
p
l
y
-
fix-
b
lank
-
at-eof'
commit
|
commitdiff
|
tree
2010-03-20
Jun
i
o
C Hamano
M
erge branch 'bw/u
n
ion-merge
-
refac
t
or'
commit
|
commitdiff
|
tree
2010-03-20
J
u
nio C Ha
m
ano
Mer
g
e
b
ranc
h
'maint'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Update
d
raft re
l
ease notes t
o
1
.
7
.
0
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Andr
e
a
s Grue
n
bacher
fetch: Fix minor memory le
a
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Andreas Gruenbache
r
fetc
h
: Future-p
r
oof i
n
i
t
ialization of a refs
p
ec
on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Andreas G
r
uenbacher
fetch: Check
f
o
r
a "
^
{}" suff
i
x wit
h
suffix
c
mp()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Ben
j
amin C Meyer
F
ix a spelling mistake in a git-p4 console mes
s
age
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Bri
a
n
G
ernhardt
U
s
e
t
es
t
_
e
xpect_suc
c
ess for test setups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Imre
D
eak
da
e
mon: pars
e
_host_a
n
d_
p
or
t
SIGSEG
V
i
f port is specified
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan Nied
e
r
M
a
k
efile:
Fi
x
occasional GIT-CFLAGS breakage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
J
onathan Nieder
Mak
e
file
:
F
i
x CD
P
ATH problem
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
B
randon Casey
notes
.
c: remove inappr
o
pria
t
e cal
l
to return
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Stephen Boyd
pull: replace unnecessary sed invocation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
J
unio C Hamano
Merge
branc
h
'main
t
'
commit
|
commitdiff
|
tree
2010-03-17
Thomas Rast
Doc
u
ment
a
t
ion: receive
.
denyCurrentBranch defau
l
t
s
to
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
I
an W
a
rd Comfort
b
a
s
h: complete *_HE
A
D
r
efs if pr
e
sent
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
J
u
nio C Hamano
Me
r
g
e br
a
nch 'maint'
commit
|
commitdiff
|
tree
2010-03-15
Michae
l
J Gruber
Document
a
tio
n
/git-read
-
tre
e
: clarif
y
2-
t
ree
merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-15
Mi
c
h
a
el J G
r
ub
e
r
Documentation/
g
it-read-tree: fix tab
l
e layou
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-15
Junio C Hamano
Merge bran
c
h '
s
d/format-patch-to'
commit
|
commitdiff
|
tree
2010-03-15
J
unio C H
a
mano
Merge bra
n
c
h
'tc/ht
t
p
-
cleanup'
commit
|
commitdiff
|
tree
2010-03-15
Junio
C Hamano
Merge
b
r
a
n
ch
'
t
c/transport-verbosity'
commit
|
commitdiff
|
tree
2010-03-15
Junio C Hamano
Merge branch 'l
d
/pus
h
-p
o
rcelain'
commit
|
commitdiff
|
tree
2010-03-15
Junio C
H
amano
Merg
e
b
ranch
'
jh/no
t
es'
commit
|
commitdiff
|
tree
2010-03-14
Junio C Ham
a
no
t
e
st
s
for "git
a
dd ignored-dir/file" witho
u
t
-
f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Jeff King
dir: fix COLLECT_IGNORED
o
n exclu
d
ed p
r
efixes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
J
unio C Haman
o
t
0050: mark non-working te
s
t as such
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
J
unio C Hama
n
o
Merge
bran
c
h 'maint'
commit
|
commitdiff
|
tree
2010-03-14
Dave Ols
z
ewski
don't use default revis
i
on
i
f a rev was specified
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
R
ené
Scharfe
for_each_recent_r
e
fl
o
g_
e
nt(): use strbuf, fix offset
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Junio C Hama
n
o
t/Makefile: remove tes
t
artifact
s
u
p
o
n
"
m
ake
c
lean"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
R
ené Scharfe
blame: fix indent of line
number
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Junio
C Hama
n
o
Merge git://git
.
bogomips
.
o
rg/
g
i
t-svn
commit
|
commitdiff
|
tree
2010-03-13
Junio C Hamano
Merge branc
h
'
m
a
int'
commit
|
commitdiff
|
tree
2010-03-12
Junio C Hamano
t5516:
U
se
t
est_cmp
w
hen appropriate
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-12
Junio C Hama
n
o
t9400: Us
e
test_cmp when app
r
opriate
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-10
Junio
C
Hamano
Mer
g
e branch 'sd/init-template'
commit
|
commitdiff
|
tree
2010-03-10
Jun
i
o C
Hamano
Merge b
r
a
nch
'
sh/am-keep-cr'
commit
|
commitdiff
|
tree
2010-03-10
Junio C Hamano
Merge br
a
nch 'cp/add-u-
p
athspec'
commit
|
commitdiff
|
tree
2010-03-10
Junio
C
Hamano
Makefile: update check-docs target
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-10
Jun
i
o
C
Ha
m
ano
Merge branch 'lt/deepen-builtin-source'
commit
|
commitdiff
|
tree
2010-03-09
Junio C Hamano
Documen
t
a
t
ion
:
i
m
pro
v
e description
of "git reset
-
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
St
e
phen Boyd
send-email:
add --no-cc, --n
o
-to, and --
n
o-bcc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
S
tephen
B
oyd
format-patch
:
add -
-
no-cc, --no-to,
and --no-add-headers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
Steph
e
n Boyd
format-
p
atch: use
a
string
_
l
is
t
for headers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
J
u
nio C Hama
n
o
Update
d
raft release
n
ote
s
to
1
.
7
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
Junio C Ham
a
no
M
e
rge
branch 'maint'
commit
|
commitdiff
|
tree
2010-03-08
Junio C Ha
m
ano
Merge accumula
t
ed fixes t
o
prepare f
o
r
1
.
7
.
0
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
Junio C
Ham
a
no
Merge branch
'
m
w
/maint-
g
c
c-warns
-
unused
-
writ
e
' into
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Jun
i
o C Hamano
Merge
br
a
nch 'fn/maint-m
k
dtemp-compat' into main
t
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Merge branch 'gb/
m
aint-submodule-env' into
m
a
int
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Me
r
ge
branch 'as/maint-ex
p
i
re'
i
nto maint
commit
|
commitdiff
|
tree
2010-03-08
Junio
C Hamano
Mer
g
e
branc
h
'
ml/
m
aint-grep
-
do
c
'
i
nto main
t
commit
|
commitdiff
|
tree
2010-03-08
Junio C H
a
man
o
Merge branch 'jk/main
t
-push-track
i
ng-wo-remote' into
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
J
u
nio
C Hamano
Merge bra
n
ch
'
jc/
f
et
c
h
-
param' into maint
commit
|
commitdiff
|
tree
2010-03-08
Juni
o
C
Ha
m
ano
Merge b
r
anch 'ne
/
pa
c
k-l
o
cal-do
c
' into maint
commit
|
commitdiff
|
tree
2010-03-08
Ju
n
i
o
C Hamano
Mer
g
e
bran
c
h 'jk/maint-add--interact
i
v
e-
d
elete' into
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Junio
C Hamano
Merge br
a
nch 'mm
/
mk
s
temp
s
-mode-for
-
packfil
e
s
'
into
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Junio C
H
amano
M
e
r
ge bran
c
h
'j
c
/maint-fix-mailinfo-strip' into maint
commit
|
commitdiff
|
tree
2010-03-08
Junio C Haman
o
Mer
g
e branch 'j
c
/grep-
a
utho
r
-al
l
-ma
t
c
h
-implicit' into
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Junio C H
a
ma
n
o
M
e
rge branc
h
'
jc/checkou
t
-detached' into maint
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
M
e
r
g
e branch 'maint-
1
.
6
.
6
'
into maint
commit
|
commitdiff
|
tree
2010-03-08
M
a
rk Lodat
o
grep:
Colorize se
l
ected,
context, and
f
unction l
i
nes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
Mar
k
L
o
dato
grep
:
Colorize filename, line number, and separat
o
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-07
J
unio
C
Hamano
Merg
e
bran
c
h 'jc/maint-fix-tes
t
-per
m
'
into maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Merge branch 'sp/
m
aint-push-sideband' into m
a
int-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
J
u
n
i
o C H
a
mano
Mer
g
e
br
a
n
c
h
'hm/main
t
-imap-send-crlf'
into
m
a
i
nt-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
J
u
nio C
H
amano
Merge
branch
'
g
f/maint-s
h
-setup-nongit-ok' into maint
.
.
.
commit
|
commitdiff
|
tree
2010-03-07
J
u
n
i
o
C Hamano
Merge branch 'jk/maint-rmdir-fix'
into maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Juni
o
C Hamano
Merge branc
h
'rs/optim-text-wrap'
into
m
aint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
J
u
nio C Hamano
Merge
branch 'tr/ma
i
nt-cherry-pic
k
-list' in
t
o maint
.
.
.
commit
|
commitdiff
|
tree
2010-03-07
J
u
ni
o
C H
a
mano
M
e
rge b
r
anch
'
c
c/ma
i
nt-bisect-p
a
t
h
s' int
o
maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio C
H
a
mano
Merg
e
branch 'mw/maint-gcc-w
a
rns-unu
s
ed-write'
commit
|
commitdiff
|
tree
2010-03-07
Ju
n
i
o
C
H
amano
M
erge bra
n
ch '
a
s/maint-ex
p
ir
e
'
commit
|
commitdiff
|
tree
2010-03-07
Junio C
Hamano
Merge branc
h
'ml/ma
i
nt-grep-doc
'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
M
e
rge branch 'fn
/
ma
i
nt-m
k
dtemp-com
p
at'
commit
|
commitdiff
|
tree
2010-03-07
J
u
nio C
H
a
mano
Merge
b
ranch
'gb/maint-subm
o
dul
e
-env'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Haman
o
M
erge branch 'ne
/
pack
-
l
o
cal-do
c
'
commit
|
commitdiff
|
tree
2010-03-07
J
u
nio C Hamano
Merge
branch 'mb/shortlog-n
o
ngit
-
stdin'
commit
|
commitdiff
|
tree
2010-03-07
Jun
i
o
C Ham
a
no
Merge
branch 'jk
/
maint-p
u
sh-tra
c
king-
w
o-
r
emote'
commit
|
commitdiff
|
tree
2010-03-07
Junio
C
H
a
m
a
no
M
erge
b
r
a
nch 'jc/fet
c
h-p
a
ram'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Merge b
r
a
nc
h
'
il/loose
n
-remote-help
e
r
-
names'
commit
|
commitdiff
|
tree
2010-03-07
Junio
C Hamano
Merg
e
branch 'n
d
/root-git'
commit
|
commitdiff
|
tree
next