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
revert: clarify label on conflict hunks
2010-03-21
Jonat
h
an
N
ieder
r
ever
t
: clarify label on conflict
h
unks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan Niede
r
com
p
a
t: add me
m
pcpy()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
N
i
e
d
er
che
c
kout
-
m --conflict=d
i
ff3: add a label for ancest
o
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan N
i
eder
merge_trees
(
):
ad
d
ancestor lab
e
l
p
a
rameter for diff3
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Niede
r
merge_file(): add comment expl
a
ining behavior
wrt con
f
lic
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n
Nieder
c
h
eckout --c
o
nflict=di
f
f3: add a lab
e
l
for
a
n
c
estor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
Nieder
ll_merge():
add
ance
s
tor lab
e
l parameter for diff3
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonatha
n
Nieder
mer
g
e
-file -
-
d
i
ff3:
add a labe
l
for ancestor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
than
N
ieder
x
dl_merge
(
): mov
e
file1 and file2 labels
to xmparam
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
N
ied
e
r
xd
l
_merge(): add optional anc
e
sto
r
label to d
i
ff3-s
t
yle
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
han Nieder
test
s
:
d
o
cument
c
herry-pick be
h
avior in face
of conflicts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
athan Nieder
te
s
ts
:
document format of conflict
s
from checkou
t
-m
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Upd
a
te draft
r
elease
n
otes to 1
.
7
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Junio
C
Hamano
Merge
b
ranch 'jk/maint-add-ignored-dir'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Merge branch 'ml/c
o
lor-g
r
e
p
'
commit
|
commitdiff
|
tree
2010-03-20
Juni
o
C Haman
o
Merg
e
branch 'jc
/
color-attrs'
commit
|
commitdiff
|
tree
2010-03-20
Ju
n
io C Hamano
M
erge branch 'cc/res
e
t
-keep'
commit
|
commitdiff
|
tree
2010-03-20
Junio C
Hama
n
o
Merge branch 'fl/askpa
s
s'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hama
n
o
M
erge branch 'bg/apply-
f
ix-blank
-
a
t
-
eof'
commit
|
commitdiff
|
tree
2010-03-20
Ju
n
io C Hamano
Merge branch 'b
w
/union-m
e
rge-
r
efactor'
commit
|
commitdiff
|
tree
2010-03-20
Juni
o
C H
a
mano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2010-03-20
Ju
n
io C
H
amano
U
pda
t
e
d
ra
f
t r
e
l
ease not
e
s to 1
.
7
.
0
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Andreas
G
ruenbacher
fetch: Fix
m
in
o
r
memory
l
eak
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
A
ndreas Gr
u
enbacher
fetch: Futu
r
e
-proof initial
i
zation of a
r
e
fspec on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Andre
a
s
G
ruenba
c
her
fetch: Check for a "^{}" s
u
ff
i
x
w
it
h
suffixcmp()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
B
enjamin C Meyer
F
i
x a
s
p
e
lling mista
k
e
in a git-p
4
c
onsole mes
s
age
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Brian Gernhardt
Use te
s
t_expect_succes
s
for test setups
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Imr
e
Deak
d
a
emon
:
parse_host_and_
p
or
t
SIGSEG
V
if
p
o
rt
is specified
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jona
t
han Nied
e
r
M
a
kefile:
F
i
x
occasional GIT-CFLAGS break
a
ge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jonath
a
n Nieder
Makefi
l
e: Fix CDPATH prob
l
em
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Brandon C
a
s
e
y
no
t
es
.
c: rem
o
ve
i
na
p
propriate call to return
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Stephen
Boyd
pull: replac
e
unnecessary sed
i
nvocation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Jun
i
o
C
Hamano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2010-03-17
Thomas Rast
Docum
e
ntation: rec
e
iv
e
.
denyCurrentBranch defaults to
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Ian Ward C
o
mfort
b
a
s
h
:
com
p
lete *_
H
EAD re
f
s if prese
n
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Junio C Hamano
Mer
g
e branch '
m
a
int'
commit
|
commitdiff
|
tree
2010-03-15
Michael J Grub
e
r
D
ocumentation
/
git-read-t
r
ee: clarify
2
-
t
r
e
e merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-15
Mich
a
el
J
G
ruber
D
ocument
a
t
i
on
/
git-read-tre
e
: fi
x
table
l
ayout
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-15
J
unio C
Ham
a
no
Merge branch 'sd/format
-
pat
c
h-to'
commit
|
commitdiff
|
tree
2010-03-15
J
u
nio C
Hamano
Merge branch 'tc/http-cleanup'
commit
|
commitdiff
|
tree
2010-03-15
Junio C Hamano
Mer
g
e branch 'tc/transport
-
verbosi
t
y
'
commit
|
commitdiff
|
tree
2010-03-15
Junio C
H
a
ma
n
o
Merge br
a
nch 'ld/push-porcelai
n
'
commit
|
commitdiff
|
tree
2010-03-15
Junio C Haman
o
Me
r
ge branch 'jh/notes'
commit
|
commitdiff
|
tree
2010-03-14
Junio C Ha
m
ano
tests for "g
i
t
a
d
d
i
gno
r
ed-dir/file"
w
i
thout -f
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-14
Jeff King
d
ir: fix COL
L
ECT_IGNOR
E
D
o
n
e
x
c
luded prefix
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-14
Junio
C
Hama
n
o
t0050
:
ma
r
k n
o
n-workin
g
t
e
st as such
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-14
Junio C Hamano
M
e
r
g
e
b
r
a
nch 'mai
n
t
'
commit
|
commitdiff
|
tree
2010-03-14
Dave O
l
sz
e
wsk
i
don't use default revision i
f
a rev was specified
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
René S
c
ha
r
f
e
f
or
_
each
_
r
ecent_reflog_ent():
use strbuf, fix
o
ffset
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
J
u
nio C Hamano
t/Makefile: remove
test artifacts
upon "make clean"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
René S
c
harfe
blame
:
fix inde
n
t
of
line numbe
r
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-13
Junio C Hamano
Merge
g
it:
/
/git
.
bogomips
.
org/git-svn
commit
|
commitdiff
|
tree
2010-03-13
Junio C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-03-12
Junio C Hamano
t5516: Use test_cmp
when appropriate
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-12
Junio C H
a
mano
t94
0
0: Use tes
t
_cmp when appropriate
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-10
Junio C Ha
m
ano
M
erge br
a
nch 'sd
/
ini
t
-te
m
plate'
commit
|
commitdiff
|
tree
2010-03-10
Junio C Hamano
Merge bra
n
ch
'
s
h
/am-keep-cr'
commit
|
commitdiff
|
tree
2010-03-10
Junio C Hama
n
o
Merge
branch 'cp/add-u-pathsp
e
c'
commit
|
commitdiff
|
tree
2010-03-10
Junio C Hamano
Makefile: upda
t
e c
h
eck-docs tar
g
e
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-10
Junio C
H
aman
o
M
erge branch
'
lt/de
e
p
e
n-builtin-
s
ource'
commit
|
commitdiff
|
tree
2010-03-09
Ju
n
io C Hamano
Documentation:
i
m
prove descript
i
on of "git
rese
t
-
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-08
Stephen
Bo
y
d
send
-
email: add --no-c
c
, --no-
t
o, and --no-bcc
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-08
Stephen Boy
d
fo
r
mat-patch:
a
d
d
--
n
o-cc, --n
o
-
t
o, and --no-
a
d
d-headers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-08
Stephen Boyd
format-patch: use
a stri
n
g_l
i
st for
h
ea
d
e
r
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Upd
a
te draft re
l
eas
e
notes to 1
.
7
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Mer
g
e branch 'maint
'
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
M
e
rge a
c
cumulated fixes to prepa
r
e for
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 bra
n
c
h
'
m
w/maint-
g
cc-warn
s
-unus
e
d-write' into
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Juni
o
C Ham
a
no
Merge branch 'f
n
/
m
a
i
n
t
-mkd
t
emp-compa
t
' i
n
to maint
commit
|
commitdiff
|
tree
2010-03-08
J
u
nio C Hamano
Me
r
g
e
bran
c
h 'gb/
m
ain
t
-submodule-env' into maint
commit
|
commitdiff
|
tree
2010-03-08
J
unio C Hamano
M
e
r
ge branch 'as/ma
i
nt-exp
i
re' into maint
commit
|
commitdiff
|
tree
2010-03-08
Junio C
H
amano
Merge branch
'
ml
/
maint-grep-doc' into maint
commit
|
commitdiff
|
tree
2010-03-08
Junio C
Hamano
Me
r
g
e branch 'jk/maint-push-trackin
g
-wo-remot
e
' int
o
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Ju
n
io C Hamano
M
e
rge
b
ranch
'
jc/fetch-param'
i
nto
maint
commit
|
commitdiff
|
tree
2010-03-08
Ju
n
i
o
C Hamano
Merge branch 'ne/pack-local-do
c
' i
n
to maint
commit
|
commitdiff
|
tree
2010-03-08
J
u
n
i
o
C Hamano
M
e
rge bra
n
ch
'
jk/maint-add--interac
t
ive-delet
e
' into
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
J
u
n
i
o
C Hamano
Mer
g
e
b
ranch 'mm/mks
t
emps-mode-for-p
a
ckfiles' int
o
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Jun
i
o C H
a
m
a
no
Merge branch 'jc/maint
-
fix
-
m
ai
l
info-strip
'
into maint
commit
|
commitdiff
|
tree
2010-03-08
Junio C H
a
mano
Me
r
ge branch 'jc/gr
e
p-auth
o
r
-al
l
-match-implicit' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Ju
n
io C Hamano
Merge branch
'jc/checkout-detached
'
into maint
commit
|
commitdiff
|
tree
2010-03-08
Juni
o
C Ham
a
no
Merge
branch 'mai
n
t-1
.
6
.
6' into ma
i
nt
commit
|
commitdiff
|
tree
2010-03-08
Mark
Lodat
o
g
r
ep
:
Coloriz
e
sele
c
ted, context, and functio
n
l
i
nes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-08
Ma
r
k Lodato
grep: C
o
lorize filen
a
m
e
, line
n
u
mbe
r
, and separator
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-07
Junio C Haman
o
M
erge branch 'jc/maint-fix
-
test-p
e
rm'
into mai
n
t-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
J
u
nio C Hamano
M
erge bran
c
h
'sp/
m
aint-pu
s
h-sid
e
band' into maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
J
u
nio C Hama
n
o
M
e
rg
e
br
a
nch
'hm/m
a
int-
i
map-send-crlf' into m
a
int-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Merg
e
branch 'gf/maint-s
h
-setup-n
o
ngit-ok' into maint
.
.
.
commit
|
commitdiff
|
tree
2010-03-07
Junio
C
Hamano
Me
r
ge
branch '
j
k
/main
t
-
rmdir-fix' i
n
to maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio C Ha
m
ano
M
erge
b
ranch 'rs/
o
ptim-te
x
t-wrap' i
n
to maint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Ju
n
i
o
C Hamano
Merge branch 'tr/maint-
c
h
erry-
p
ick-list' into maint
.
.
.
commit
|
commitdiff
|
tree
2010-03-07
Junio C Ha
m
a
n
o
Merge branch
'cc/maint-bisect-p
a
t
h
s
' into
m
aint-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Jun
i
o C Hamano
Merg
e
branch 'mw/maint-gcc-warn
s
-
u
nu
s
e
d
-
write'
commit
|
commitdiff
|
tree
2010-03-07
Junio
C
Hamano
Merge br
a
nch 'as/main
t
-expi
r
e'
commit
|
commitdiff
|
tree
2010-03-07
Jun
i
o C Ham
a
n
o
Merge br
a
nch 'ml/mai
n
t-grep-doc'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hama
n
o
Merge
br
a
nch
'
fn/maint-mkdtemp-compat'
commit
|
commitdiff
|
tree
2010-03-07
Junio
C
Hamano
Merge
b
ranch '
g
b/maint-submodule-
e
nv'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Ham
a
no
Mer
g
e branch 'ne/pa
c
k-local-doc
'
commit
|
commitdiff
|
tree
2010-03-07
Jun
i
o C Hamano
Merge branch 'mb/shortlog-nongit
-
s
tdin'
commit
|
commitdiff
|
tree
2010-03-07
Junio
C
Ham
a
n
o
Merge
b
ranch 'jk/ma
i
nt-pus
h
-tra
c
kin
g
-w
o
-remote
'
commit
|
commitdiff
|
tree
2010-03-07
Junio C
H
a
mano
M
erge branch 'jc/fetch-pa
r
am'
commit
|
commitdiff
|
tree
next