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
J
onathan Niede
r
r
evert: clarify label on c
o
n
f
l
i
ct h
u
nks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
compat: add mem
p
cpy()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
a
n N
i
eder
checkout -m
-
-c
o
nflict=diff3
:
add a l
a
bel fo
r
anc
e
stor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n Nie
d
er
merg
e
_tree
s
():
a
dd ancestor label
param
e
t
er for diff3
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
Ni
e
d
e
r
merge
_
file():
a
d
d
comment explai
n
in
g
behavior wr
t
co
n
flict
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
athan Nieder
checkout --confli
c
t=diff3: add a label for
a
nces
t
or
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Niede
r
ll_merge(
)
:
add ancestor label pa
r
ame
t
er for
diff3
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
merge-fil
e
--
d
iff3: add
a
l
abel f
o
r an
c
estor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
t
h
an
Ni
e
der
xdl_me
r
ge(
)
:
m
ove f
i
le1 and file2 labe
l
s to xmpara
m
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan N
i
eder
xdl_merge(): add
optiona
l
a
nc
e
stor
lab
e
l to dif
f
3-st
y
le
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
han Nied
e
r
tests: document cherry-p
i
ck b
e
havior in face of conflicts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nied
e
r
tests
:
docume
n
t format of conflicts
f
r
om checkout -m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Upda
t
e
dr
a
f
t
re
l
ease no
t
es to
1
.
7
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Junio C Haman
o
M
e
r
ge branch
'
j
k/maint-add-ignored-dir
'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Ha
m
ano
Merg
e
bra
n
ch 'ml/color
-
g
rep'
commit
|
commitdiff
|
tree
2010-03-20
Jun
i
o C Hamano
Me
r
ge br
a
n
ch 'j
c
/colo
r
-att
r
s'
commit
|
commitdiff
|
tree
2010-03-20
J
unio C
H
amano
Merge b
r
a
n
ch 'cc/re
s
et-keep'
commit
|
commitdiff
|
tree
2010-03-20
Junio
C
Hamano
Merge
b
r
a
n
ch 'fl/askpass'
commit
|
commitdiff
|
tree
2010-03-20
Juni
o
C Hamano
M
er
g
e b
r
anch 'bg/apply-
f
ix-blank-at-eof'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Merge branch 'bw/
u
nion-merge-refactor'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-03-20
J
u
nio C
Hamano
Update draft release notes
t
o 1
.
7
.
0
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
A
ndreas Gruenbache
r
fetc
h
: Fix mino
r
memory l
e
ak
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Andreas Gruenbacher
fetch:
Future-proof initiali
z
at
i
on o
f
a refspec
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
A
n
dreas Gruenbacher
fetch: Check fo
r
a "^{}" suffix with
suffix
c
mp
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Benjamin C
Me
y
er
Fix a spelling mistake in
a git-p4 c
o
nsole
m
essag
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Brian Gernhardt
Use tes
t
_e
x
pect_succ
e
s
s for
test setups
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Imre Deak
d
ae
m
on: par
s
e_host_a
n
d
_
port SIG
S
EGV
i
f
port is s
p
ecifie
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan Nieder
Makefile
:
Fix occ
a
sional GIT-CFLAGS
b
reakage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Jo
n
athan Nieder
Makefile:
Fix C
D
PATH
problem
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Bra
n
don Casey
not
e
s
.
c: remove inappro
p
riate
c
all to return
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Stephen
Bo
y
d
pull: replace unnece
s
sary sed invocation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Jun
i
o C Hama
n
o
M
e
rg
e
b
r
an
c
h 'm
a
int'
commit
|
commitdiff
|
tree
2010-03-17
Thomas Ra
s
t
Doc
u
mentation: r
e
ceive
.
denyCurrentBranch
d
efaults 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
:
c
omplete *
_
HEAD r
e
fs if present
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-17
Junio C Hamano
Merg
e
branc
h
'maint'
commit
|
commitdiff
|
tree
2010-03-15
Micha
e
l J Gruber
Doc
u
mentat
i
on
/
git-read-t
r
ee
:
clarify 2-tree merge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-15
Michael J Grub
e
r
Documen
t
ation/gi
t
-
r
ead-tree: fix table lay
o
ut
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-15
Jun
i
o C Hamano
Me
r
ge branch 'sd/format-patch-to'
commit
|
commitdiff
|
tree
2010-03-15
Junio C Hamano
Merge branch 'tc
/
http
-
cleanu
p
'
commit
|
commitdiff
|
tree
2010-03-15
Junio C Hamano
Merge b
r
anch 'tc/tran
s
por
t
-ve
r
bosity'
commit
|
commitdiff
|
tree
2010-03-15
Junio C
H
amano
Me
r
ge
b
r
anch
'
l
d/pu
s
h-porcela
i
n'
commit
|
commitdiff
|
tree
2010-03-15
Junio C Hamano
M
e
rge branch 'jh/notes'
commit
|
commitdiff
|
tree
2010-03-14
Ju
n
io C Ham
a
no
t
e
sts f
o
r "git add ignored-dir/
f
ile"
without
-f
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Jeff King
dir: fi
x
COLLECT_IGNORE
D
o
n
excluded prefixe
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Junio C H
a
mano
t
0
050:
m
ark non-
w
orking test as such
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-14
Ju
n
i
o
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-03-14
D
ave Olszewski
don't use def
a
ult revision if a
r
e
v
was specif
i
ed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Ren
é
Sc
h
arfe
fo
r
_each_recent_reflog_ent(): use strbuf, f
i
x offset
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
J
unio C Hama
n
o
t/Makef
i
le: remove test
artifa
c
ts upon "mak
e
clean"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
René Scharf
e
blame: fix indent of line num
b
ers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-13
Jun
i
o
C
Hamano
M
erg
e
git://git
.
bogomips
.
o
r
g/git-svn
commit
|
commitdiff
|
tree
2010-03-13
Juni
o
C Hamano
M
e
rge branch '
m
aint'
commit
|
commitdiff
|
tree
2010-03-12
Ju
n
io C
Hamano
t551
6
: Use t
e
s
t_cmp when approp
r
iat
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-12
J
u
n
io C
Hama
n
o
t9400:
U
se t
e
st_cmp when a
p
propri
a
te
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-10
J
unio C Ha
m
ano
Merge branch '
s
d/init-template'
commit
|
commitdiff
|
tree
2010-03-10
Junio
C Hamano
Merge
br
a
nch 'sh/a
m
-
keep-cr'
commit
|
commitdiff
|
tree
2010-03-10
Junio C Hamano
M
erge branch 'cp/add-u-p
a
thspec'
commit
|
commitdiff
|
tree
2010-03-10
Junio C Hama
n
o
Makefile:
updat
e
chec
k
-
docs
t
ar
g
et
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-10
Junio C H
a
ma
n
o
Mer
g
e branch '
l
t/deepen-builtin-source'
commit
|
commitdiff
|
tree
2010-03-09
Junio C Ham
a
no
Document
a
t
ion: improve
d
escriptio
n
of "git
r
eset -
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
S
t
e
p
hen Boyd
sen
d
-ema
i
l: add --
n
o-cc
,
-
-
no-to, an
d
--no-bcc
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
S
t
ephen
Boy
d
format-patch: add --no
-
c
c, --no-
t
o,
and --
n
o-
a
dd-heade
r
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
Stephen Boyd
forma
t
-pa
t
c
h
: u
s
e a string_l
i
st for h
e
a
d
e
r
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
Jun
i
o
C H
a
mano
U
pdate dra
f
t release notes to 1
.
7
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Merg
e
branch 'maint'
commit
|
commitdiff
|
tree
2010-03-08
Junio C Ham
a
no
Merge accumulated 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 H
a
mano
M
e
r
ge branch 'mw
/
maint-
g
cc-warns-unused-write' into
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
J
u
nio C Hamano
Merge br
a
nch 'fn/maint-mkdtemp-
c
ompat' i
n
to maint
commit
|
commitdiff
|
tree
2010-03-08
J
u
nio
C H
a
mano
M
erg
e
branch 'gb/maint-submodule-env
'
int
o
maint
commit
|
commitdiff
|
tree
2010-03-08
Junio C Haman
o
Merge branch 'as/maint
-
e
xpire
'
int
o
maint
commit
|
commitdiff
|
tree
2010-03-08
Juni
o
C
Ha
m
a
no
Merge b
r
anch 'm
l
/ma
i
nt-g
r
ep-doc
'
into maint
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Me
r
ge branch 'j
k
/maint-push
-
tracking-wo-remote
'
into
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Jun
i
o
C
Hama
n
o
M
e
r
ge branch 'jc/fetch-pa
r
am'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2010-03-08
Junio C Hamano
Merge bra
n
ch 'ne/pack-local-doc' into maint
commit
|
commitdiff
|
tree
2010-03-08
Jun
i
o
C Hamano
M
erge
b
ranch 'jk/maint-a
d
d
-
-intera
c
tiv
e
-delete' into
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Ju
n
io
C
Hamano
Merge
branch 'mm/m
k
stem
p
s-mode-for
-
packfiles' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Junio C
H
amano
M
e
rge branch 'jc/maint-
f
i
x
-mailinfo-
s
trip' into maint
commit
|
commitdiff
|
tree
2010-03-08
J
u
n
io C Hamano
Merg
e
branch 'jc/g
r
ep-a
u
thor-
a
l
l-m
a
tch-impl
i
cit
'
i
n
to
.
.
.
commit
|
commitdiff
|
tree
2010-03-08
Junio
C H
a
ma
n
o
Merge branch 'jc/checkout
-
detached' in
t
o maint
commit
|
commitdiff
|
tree
2010-03-08
Junio C Ham
a
n
o
Merge b
r
a
nch 'maint-1
.
6
.
6' into maint
commit
|
commitdiff
|
tree
2010-03-08
Mark Lodato
grep: Colorize sel
e
cte
d
, cont
e
x
t
,
and fun
c
tion line
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-08
Mark Lodato
grep: Colorize f
i
lename, line number, and separ
a
tor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-07
Junio C
H
a
m
ano
Merge branch 'jc/m
a
int-fix-test-perm' into
maint
-
1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
Me
r
g
e
branch 'sp/maint-push-sid
e
b
and' i
n
to ma
i
n
t
-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Jun
i
o C
Haman
o
Merge b
r
a
nch '
h
m/maint-imap-send-crlf' into
m
ain
t
-
1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Jun
i
o C Hamano
Merg
e
b
ranch 'gf/
m
aint
-
sh-
s
etup-non
g
it-o
k
' into maint
.
.
.
commit
|
commitdiff
|
tree
2010-03-07
Juni
o
C
Hamano
M
e
rge branch 'jk
/
m
aint
-
rmdir-fix
'
into m
a
int-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio
C
H
a
man
o
M
e
r
g
e
b
ranch 'rs/optim-t
e
xt-w
r
a
p
' into ma
i
nt-
1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
J
u
nio C Hamano
Merge bran
c
h
't
r
/
m
ain
t
-
c
herry-pick-
l
ist'
int
o
m
aint
.
.
.
commit
|
commitdiff
|
tree
2010-03-07
Junio C
H
amano
Me
r
ge bra
n
ch 'cc/maint-bisect-paths' in
t
o mai
n
t-1
.
6
.
6
commit
|
commitdiff
|
tree
2010-03-07
Junio
C
Hamano
Merge br
a
nch 'mw/maint-
g
cc-
w
arns-u
n
used-write'
commit
|
commitdiff
|
tree
2010-03-07
Junio C
Hamano
Merg
e
branch 'as/mai
n
t
-
expire'
commit
|
commitdiff
|
tree
2010-03-07
Junio C
H
amano
M
e
rge bra
n
c
h 'ml/main
t
-grep-doc'
commit
|
commitdiff
|
tree
2010-03-07
Junio
C
H
a
m
a
no
Merge b
r
anch 'fn/maint-mkdtemp-comp
a
t'
commit
|
commitdiff
|
tree
2010-03-07
J
u
nio C Hamano
Me
r
g
e
branch 'g
b
/maint-s
u
bmodule-env'
commit
|
commitdiff
|
tree
2010-03-07
J
u
nio C Hamano
M
erge branch
'ne/p
a
ck-local-doc'
commit
|
commitdiff
|
tree
2010-03-07
Junio C Hamano
M
erge branch 'mb/shortlog
-
nongit-stdin'
commit
|
commitdiff
|
tree
2010-03-07
Ju
n
io C Hamano
Me
r
g
e
bran
c
h 'j
k
/maint
-
push-tracking-wo-remote'
commit
|
commitdiff
|
tree
2010-03-07
Jun
i
o C Hamano
Merg
e
branch 'jc/fetch-param'
commit
|
commitdiff
|
tree
next