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
Merge branch 'ja/send-email-ehlo' into next
2010-03-29
J
u
nio C
H
amano
Merge branc
h
'ja/send-email-ehlo' into next
commit
|
commitdiff
|
tree
2010-03-29
J
u
nio C Hamano
Merge branch 'do/
r
ebase-i-arbitra
r
y
'
into ne
x
t
commit
|
commitdiff
|
tree
2010-03-29
Junio C Ha
m
ano
M
erge bra
n
c
h '
a
k
/everyday-git
'
into next
commit
|
commitdiff
|
tree
2010-03-29
Junio C Hamano
M
e
rge branch 'master'
i
nto next
commit
|
commitdiff
|
tree
2010-03-29
Junio C H
a
m
a
n
o
U
pda
t
e draft
release
n
o
tes
to
1
.
7
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-29
Junio C Hamano
M
e
rge branch
'
cc/cherr
y
-pick
-
ff'
commit
|
commitdiff
|
tree
2010-03-29
Junio
C
Ham
a
no
Merg
e
br
a
nch
'sb/notes-
p
a
r
se-opt
'
commit
|
commitdiff
|
tree
2010-03-29
Junio C Hamano
Mer
g
e
branch 'main
t
'
commit
|
commitdiff
|
tree
2010-03-29
Thomas R
a
st
re
b
a
s
e -i:
ma
k
e post-
r
ewrite work f
o
r 'edit
'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-29
Junio C Hama
n
o
Prepar
e
f
o
r 1
.
7
.
0
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-29
Junio
C H
a
m
a
n
o
M
e
rge branch 'cp/
a
dd
-
u
-
path
s
pec' into m
a
int
commit
|
commitdiff
|
tree
2010-03-29
Junio C Hamano
Merg
e
bran
c
h 'mas
t
er' into
next
commit
|
commitdiff
|
tree
2010-03-29
J
un
i
o C Hamano
Merg
e
bra
n
ch '
m
aint'
commit
|
commitdiff
|
tree
2010-03-29
Junio C Hama
n
o
t9
3
50:
f
ix
c
areless u
s
e of "cd"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-28
David Aguilar
difftool
:
Fix '--gui' when
d
iff
.
g
u
itoo
l
i
s unconfigured
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-28
Sverre Rabbelier
fast-expor
t
: do
n
't segfault when marks f
i
le cannot
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-28
Chris We
b
b
i
m
ap-s
e
nd: s
u
ppress
w
a
rning about clea
r
te
x
t
pas
s
word
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hamano
Mer
g
e branc
h
'sb/notes-parse-o
p
t' into n
e
xt
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hamano
M
erge branch 'master' in
t
o
n
e
x
t
commit
|
commitdiff
|
tree
2010-03-24
Junio C H
a
man
o
Merge branch '
j
h/maint-submodule-status-in-voi
d
'
commit
|
commitdiff
|
tree
2010-03-24
J
unio C
Haman
o
Mer
g
e
b
ranch
'
tr
/
notes-displ
a
y
'
commit
|
commitdiff
|
tree
2010-03-24
J
u
nio
C
Hama
n
o
Merge bra
n
c
h
'jl/submodule
-
d
iff-dirtines
s
'
commit
|
commitdiff
|
tree
2010-03-24
Juni
o
C Hamano
Merge branch
'
pb/log-first-parent-p
-
m'
commit
|
commitdiff
|
tree
2010-03-24
Junio
C
Hamano
Merge
branch 'j
c
/mai
n
t-
r
efs-dangling'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hama
n
o
Merge
b
ran
c
h 'm
a
int
'
commit
|
commitdiff
|
tree
2010-03-24
Juni
o
C Ha
m
ano
Merg
e
branch 'j
c
/color-a
t
trs' into maint
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hamano
Merge branch 'j
k
/maint
-
add-ignored-dir' into
maint
commit
|
commitdiff
|
tree
2010-03-24
Junio
C H
a
ma
n
o
Merge branc
h
'bg/apply-fix-blan
k
-at-eof' into maint
commit
|
commitdiff
|
tree
2010-03-24
Mark
u
s
H
e
idelb
e
rg
Do
c
umentat
i
o
n
:
e
xplain the
meanin
g
of "-g"
i
n git
-
descr
i
be
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-22
Junio C
H
ama
n
o
M
e
rge b
r
a
n
ch 'mast
e
r'
in
t
o next
commit
|
commitdiff
|
tree
2010-03-22
Junio C Ham
a
no
S
yn
c
with Git 1
.
7
.
0
.
3
commit
|
commitdiff
|
tree
2010-03-22
J
unio C Hamano
Git 1
.
7
.
0
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-22
Junio
C
Ha
m
ano
Merge branch 'main
t
-1
.
6
.
6' into maint
commit
|
commitdiff
|
tree
2010-03-21
Micha
e
l J Gruber
.
m
a
ilmap: Map the the fir
s
t s
u
bmissions of
M
JG by e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Michael J Gruber
Docume
n
t
a
tion/git-clone:
T
ransform descript
i
o
n list
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Michael J Gruber
Docu
m
e
n
ta
t
ion/u
r
ls: Remov
e
spurious example
m
a
rke
r
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Michael J Gruber
Docum
e
ntation/gitdiffco
r
e: Remove m
i
slea
d
ing date in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Michael J Grube
r
Documentation/gi
t
-
r
eflo
g
: Fix
f
o
rmatting of c
o
mmand
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Ju
n
io C
H
amano
Merge b
r
a
nch 'j
n
/merge-diff
3
-label' into
n
ext
commit
|
commitdiff
|
tree
2010-03-21
J
o
n
a
t
han Nie
d
er
merge-recur
s
ive: add a label for ancest
o
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
o
natha
n
N
ied
e
r
cherry-
p
ick, r
e
vert: add a label for ancestor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
Niede
r
revert:
c
la
r
ify label
o
n
c
onflict hu
n
ks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nathan Ni
e
der
compat: add mempcp
y
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Ni
e
der
c
h
e
c
k
out -m --
c
onflict=diff3: add a label fo
r
ancestor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
than Ni
e
der
merge
_
trees():
add a
n
cestor label parameter for diff3
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
than
Nieder
mer
g
e
_file
(
): ad
d
comment explaining behavior
w
r
t
c
onflict
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
o
n
a
t
h
a
n
Nieder
c
heckout --
c
o
n
f
lict
=
di
f
f3: add a label f
o
r ancestor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
ha
n
Nieder
ll_me
r
ge(): add ances
t
or label paramet
e
r for
d
i
ff3
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
han Nieder
m
erge-file
-
-diff3: add a
l
ab
e
l for a
n
cestor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
an Nieder
xdl_merge(): move file1 and
f
i
l
e2 labels
t
o xm
p
aram
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
xdl_merge(): add optio
n
al ancestor label to diff3
-
style
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
tests: document ch
e
rry-pic
k
behavior in
face of conflicts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
at
h
an Nieder
t
ests: document forma
t
o
f
conflicts from
c
h
e
ck
o
ut -m
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Junio C Hamano
M
e
rge bra
n
c
h
'
cc
/
c
her
r
y-pick
-
f
f' into next
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
Nieder
revert: fix tiny
m
emory
leak
i
n
ch
e
rry
-
pick --ff
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Junio C
Hamano
Merge branch 'cc/cherry-p
i
ck
-
ff'
i
n
t
o n
e
x
t
commit
|
commitdiff
|
tree
2010-03-20
Juni
o
C Hamano
Revert "cherry-pick: add
a no-op
-
-no-ff op
t
ion to
.
.
.
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Mer
g
e branch
'js/async-thread' (early
p
art) into
n
e
xt
commit
|
commitdiff
|
tree
2010-03-20
Junio C Haman
o
M
erge branch 'master' into next
commit
|
commitdiff
|
tree
2010-03-20
J
u
nio
C
Haman
o
Update draft
rele
a
s
e notes
to 1
.
7
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Junio C Haman
o
Merge branch
'
jk/maint-add-ign
o
red-dir'
commit
|
commitdiff
|
tree
2010-03-20
Ju
n
io C Hamano
Merge b
r
anch '
m
l/
c
olor-g
r
ep'
commit
|
commitdiff
|
tree
2010-03-20
Ju
n
io C
Hamano
Merge branch 'j
c
/c
o
lo
r
-at
t
rs
'
commit
|
commitdiff
|
tree
2010-03-20
Junio C
H
amano
Merg
e
branch 'cc/reset
-
keep'
commit
|
commitdiff
|
tree
2010-03-20
J
un
i
o C Hamano
Me
r
g
e
b
r
anch
'
f
l
/askpass'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Me
r
ge branch
'
bg/
a
pply-fix-blank-at-eo
f
'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Me
r
ge branch 'bw/un
i
o
n
-merge-ref
a
ctor'
commit
|
commitdiff
|
tree
2010-03-20
Ju
n
i
o
C Hamano
Merge branc
h
'maint'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
U
pdat
e
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
Chr
i
stian Couder
re
b
ase -
i
: use new
--ff
cher
r
y-pick option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
An
d
reas Gru
e
nbacher
fetch: Fix m
i
nor memory l
e
ak
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Andr
e
as
G
ruen
b
acher
fetch
:
Future
-
proof ini
t
ia
l
ization of a refspec on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Andreas G
r
uenbacher
fetch: Che
c
k for a "^{}" suffix with s
u
ff
i
xcmp()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Ben
j
ami
n
C Meyer
Fix a spelling mistake in a
g
it-
p
4
c
ons
o
le
m
essage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Brian Gernhardt
Use
t
e
st_expect
_
su
c
cess
f
or test setups
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Imre D
e
ak
d
a
emon:
p
arse_host_and_port SIGSEGV if
p
ort is specified
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
J
onathan Nieder
Makefi
l
e: Fix
occ
a
sional GIT-CFLAG
S
brea
k
a
ge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
J
ona
t
han Nie
d
er
Makefile
:
Fix CDPATH
p
r
oblem
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
B
randon Casey
notes
.
c: remov
e
inappropri
a
te cal
l
to retu
r
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
S
tep
h
en Boyd
pull: replace
u
nnecessary se
d
invo
c
ation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Junio
C Hamano
Merge branch 'm
a
ster
'
into ne
x
t
commit
|
commitdiff
|
tree
2010-03-17
Junio C H
a
ma
n
o
Merge b
r
a
n
c
h
'maint'
commit
|
commitdiff
|
tree
2010-03-17
Thomas Rast
Docu
m
entatio
n
: r
e
c
e
ive
.
d
enyCurrentBranch defaults
t
o
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Ian
Ward Comfort
ba
s
h:
co
m
pl
e
te *_HEAD
r
efs i
f
present
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-17
Juni
o
C Hamano
Merge
b
ra
n
ch 'master' into next
commit
|
commitdiff
|
tree
2010-03-17
Ju
n
io C Hamano
Me
r
g
e
bra
n
ch
'main
t
'
commit
|
commitdiff
|
tree
2010-03-17
Junio C
H
amano
Merge branch 'jc/maint-refs-
d
anglin
g
'
into
n
ext
commit
|
commitdiff
|
tree
2010-03-17
Ande
r
s Kaseorg
eve
r
yday: fs
c
k an
d
gc
a
re not
ev
e
ryday operations
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-16
Junio C Ham
a
no
re
f
s
:
r
e
f entry with NULL sha1
is c
a
n
be a dangling
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-15
Michael J G
r
uber
Documen
t
a
t
i
on/git
-
read-tree: clarif
y
2-tree merg
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-15
Michael J Grub
e
r
Documenta
t
ion/git-read-tree
:
fix tab
l
e lay
o
ut
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-15
Junio C Hamano
Merge b
r
anc
h
'pb/log-first-parent-p-m'
int
o
n
e
xt
commit
|
commitdiff
|
tree
2010-03-15
Junio C Hamano
Merge br
a
nch
'jl/submodule-diff-di
r
tiness' int
o
next
commit
|
commitdiff
|
tree
2010-03-15
Junio C H
a
mano
Merge
branch 'jh/
m
a
int
-
submodule-sta
t
us
-
in-
v
oid' int
o
.
.
.
commit
|
commitdiff
|
tree
2010-03-15
J
u
nio C Hamano
M
e
rge b
r
anch 't
r
/
notes
-
display' into next
commit
|
commitdiff
|
tree
2010-03-15
J
un
i
o
C
Ha
m
ano
Merg
e
br
a
n
c
h 'm
a
ster' i
n
to next
commit
|
commitdiff
|
tree
2010-03-15
Jun
i
o
C Hamano
Merge
branch 'sd/format-patch
-
to'
commit
|
commitdiff
|
tree
2010-03-15
Junio C Hamano
Merge bran
c
h 'tc/http
-
cleanup'
commit
|
commitdiff
|
tree
2010-03-15
Juni
o
C Hamano
M
e
rge b
r
anch
'
t
c/transpor
t
-verbosity'
commit
|
commitdiff
|
tree
2010-03-15
J
unio C
H
amano
Me
r
ge b
r
a
nch 'ld
/
p
u
sh-porcelain'
commit
|
commitdiff
|
tree
next