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 'mg/use-default-abbrev-length-in-rev-list'
2010-04-03
Ju
n
io C Hamano
M
erge branch
'
mg/use-default-abbrev-le
n
g
th-in-rev-list'
commit
|
commitdiff
|
tree
2010-04-03
Juni
o
C H
a
mano
Merge bran
c
h 'mg
/
maint
-
send-email-la
z
y-editor'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hama
n
o
Merge branch '
r
b/maint-pyt
h
on-pat
h
'
commit
|
commitdiff
|
tree
2010-04-03
Junio C H
a
mano
Merge branch 'jn/
m
erge-dif
f
3-label'
commit
|
commitdiff
|
tree
2010-04-03
Juni
o
C Hamano
Merge bran
c
h 'ef/cherry-abbrev'
commit
|
commitdiff
|
tree
2010-04-03
J
unio C Haman
o
Merge branch 'bw/temp
l
ate-
t
ool-buildconfig'
commit
|
commitdiff
|
tree
2010-04-03
Jun
i
o C H
a
mano
Merge branch 'mg/mailmap-update'
commit
|
commitdiff
|
tree
2010-04-03
Jun
i
o
C
H
amano
Merge bra
n
c
h 'bc
/
t5505-
f
ix'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
Mer
g
e branc
h
'gh/maint-stash-show-
e
rror-message'
commit
|
commitdiff
|
tree
2010-04-03
Junio C
H
a
mano
Merge br
a
nch 'rs/thre
a
ded-
g
rep-context'
commit
|
commitdiff
|
tree
2010-04-03
Junio
C
Hamano
Mer
g
e branch '
b
c/maint-daemon-s
a
ns-ss-family'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
M
e
rge
branch 'bc/a
c
l
-
tes
t
'
commit
|
commitdiff
|
tree
2010-04-03
Junio
C
Hamano
Merge branch 'ja/sen
d
-ema
i
l-eh
l
o'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Ha
m
ano
Merge
b
ranch
'do/rebase-i-arbi
t
rary
'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
Merge branch 'ak/everyd
a
y-git'
commit
|
commitdiff
|
tree
2010-04-03
Jonathan Nieder
Makefi
l
e: future-proof C
y
g
w
in version
c
h
eck
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-03
YONETANI Tomo
k
azu
Fix _XOPEN_SOURCE pr
o
blem o
n
DragonFly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-02
Marku
s
Heidelber
g
builtin/commit: remove
unnecessary varia
b
l
e definitio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-02
M
a
rkus Heidelb
e
rg
builti
n
/commit: fix
d
uplicated sentence in
a
comment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-02
Er
i
c Raymond
Integrate versio
n
3 ciabot scripts
i
nto contrib/
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-04-02
Eric Blak
e
Makefile: up
d
ate defaul
t
s for mo
d
ern Cygwin
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
Juni
o
C Hamano
S
ync with 1
.
7
.
0
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
Ju
n
io C Hamano
Gi
t
1
.
7
.
0
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
Junio
C
H
a
ma
n
o
M
e
r
ge
b
ra
n
ch 'jc/maint-refs
-
da
n
gling' into
maint
commit
|
commitdiff
|
tree
2010-03-31
Holger
Weiß
Documentati
o
n: show-ref <pattern
>
s
ar
e
optional
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
H
o
l
ger Wei
ß
Link
against libiconv
o
n I
R
IX
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
Holger Weiß
D
on't
rede
f
ine h
t
o
nl and nto
h
l on big-en
d
ian
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
Jakub Nare
b
s
k
i
gitweb: g
i
t_ge
t
_pro
j
ect_config requ
i
res
o
nly $git
_
dir
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-31
J
a
n
Stępień
U
p
dated
t
he usage string
o
f
g
i
t rese
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-30
Greg Bacon
D
o
cumentation
:
C
l
a
rify support for s
m
art HTTP backend
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-30
J
ohannes Si
x
t
Windows: fix utime() for read-only f
i
les
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-30
Johannes Sixt
diff: fix
t
extconv
error zombi
e
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-30
J
unio C
H
amano
Merge branch
'mai
n
t'
commit
|
commitdiff
|
tree
2010-03-30
Kevin B
a
llard
fo
r
mat-
p
atch: Squelch 'fata
l
: Not a
range
.
" error
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-29
J
u
n
io C Hamano
U
pdate
d
raft releas
e
notes to 1
.
7
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-29
Junio
C Ha
m
ano
Merge branch
'
cc/cherry-pick-ff'
commit
|
commitdiff
|
tree
2010-03-29
J
u
nio C Hamano
Merge branch 'sb
/
not
e
s-parse-opt'
commit
|
commitdiff
|
tree
2010-03-29
Juni
o
C
H
a
mano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2010-03-29
Thomas
Rast
rebase -i: make p
o
s
t
-
r
ewrite work
f
o
r 'edi
t
'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-29
J
unio
C
Haman
o
Prepare for 1
.
7
.
0
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-29
Ju
n
io C Hamano
Merge b
r
anch
'cp/add-u-pathspec' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2010-03-29
Junio
C Hama
n
o
M
e
rge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2010-03-29
Junio C Ha
m
ano
t935
0
: fix carele
s
s
use of "cd"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-28
David A
g
uil
a
r
difftool
:
Fi
x
'--gui' whe
n
dif
f
.
guitool is unconfi
g
ured
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-28
S
verre Rabbelier
fast
-
export:
d
on't
s
e
g
fault when ma
r
ks file cannot
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-28
C
h
ris Webb
imap-send
:
suppress warning about cleartext pas
s
word
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-25
M
icha
e
l J Gru
b
er
s
end-email: l
a
zily
assig
n
editor va
r
ia
b
le
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-24
J
u
nio C Ham
a
n
o
Mer
g
e
branch 'jh/main
t
-submodule-status-in-v
o
id'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hamano
M
erge br
a
nch 'tr/note
s
-di
s
play'
commit
|
commitdiff
|
tree
2010-03-24
Ju
n
io C Ha
m
ano
Merge b
r
anch 'jl/submodule-diff-dirtiness'
commit
|
commitdiff
|
tree
2010-03-24
Junio
C
Hamano
Merg
e
branch 'pb/log-fir
s
t-
p
are
n
t-p-m'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hamano
Merg
e
bra
n
ch 'jc/
m
aint-r
e
fs-
d
angling'
commit
|
commitdiff
|
tree
2010-03-24
J
u
nio C Hamano
Mer
g
e
b
ranch 'maint'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Ha
m
ano
Merge br
a
nc
h
'jc/colo
r
-attrs' into
maint
commit
|
commitdiff
|
tree
2010-03-24
Junio C Ha
m
ano
Mer
g
e
branch '
j
k/maint-
a
d
d-ign
o
re
d
-dir'
into maint
commit
|
commitdiff
|
tree
2010-03-24
Junio C Ha
m
ano
Me
r
ge branch 'bg/apply-fi
x
-
b
lank-at-eof' into mai
n
t
commit
|
commitdiff
|
tree
2010-03-24
R
.
Ty
l
er Bal
l
ance
Correct references to /u
s
r/bin/pyth
o
n
which
does
n
ot
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-24
Mar
k
u
s
Heidel
b
erg
Documentation
:
exp
l
a
i
n
the meaning of "-
g
" in
git-describe
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-24
Michael
J
Gruber
r
e
v-list: use default abbrev length whe
n
abbrev
-
c
o
m
m
i
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-22
J
u
nio C
Haman
o
S
ync with G
i
t 1
.
7
.
0
.
3
commit
|
commitdiff
|
tree
2010-03-22
J
unio C H
a
mano
G
i
t
1
.
7
.
0
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-22
Junio C Hama
n
o
Merge branch
'
maint-1
.
6
.
6
'
in
t
o maint
commit
|
commitdiff
|
tree
2010-03-21
Michael J Gr
u
b
e
r
.
mailmap:
M
ap
the the
f
i
r
st submi
s
sions of MJG by e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Erik Faye-Lund
ls: remove red
u
n
dant logic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Erik
Faye-L
u
nd
c
herry
:
s
upport -
-
abbrev opti
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
M
ichael J Gruber
D
o
cumenta
t
ion/git-clo
n
e
:
T
r
a
nsform descrip
t
ion list
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Michael J Gruber
Documentation/url
s
: Remove spurious exam
p
le m
a
r
kers
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Mic
h
a
el J
G
ru
b
er
D
ocu
m
entati
o
n/git
d
iffcore: Remove misleading date in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Michael J Gruber
Document
a
tion
/
git-
r
eflog: F
i
x formatting of command
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
merge-recursi
v
e: add a label for ance
s
tor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
Nieder
ch
e
rry-pick, reve
r
t: add a
l
abel for ancesto
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
athan Nieder
reve
r
t: clarify label on
con
f
lict hunks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
com
p
at:
a
dd
m
em
p
cpy()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
checkout -m --
c
onflict=
d
i
ff3: add a l
a
bel
f
or
a
ncestor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
Nieder
merge
_
trees(): add
ancestor label parameter for diff3
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
N
ieder
m
e
r
g
e_file(): add comm
e
nt expla
i
n
i
ng beha
v
ior wrt conflic
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
Nieder
c
h
e
c
kout --conflict=d
i
ff3: add a label fo
r
a
ncestor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
onathan Nieder
ll_
m
erge()
:
add ancestor
l
abel parameter for diff3
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
merge-file --
d
iff3: add a label for ancestor
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
athan Ni
e
der
x
dl_merge
(
): move file1
and
file2 l
a
bels
to xmp
a
ra
m
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan N
i
eder
xdl_me
r
ge()
:
ad
d
o
p
tional an
c
estor label to di
f
f3-style
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nathan Nieder
te
s
ts: document che
r
ry-pick b
e
havior
in fa
c
e of con
f
lic
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan N
i
eder
tests: document
f
orma
t
of confli
c
ts from checkout
-m
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Michael J Grub
e
r
.
mailmap
:
En
t
r
i
es
for Alex Bennée, Deskin
Mille
r
,
Vitaly
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
a
t
han Nieder
revert:
fix tiny m
e
mory leak
in
c
herry-pick --ff
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Junio C
Hamano
Updat
e
dr
a
ft rel
e
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 Hamano
Merge branch 'jk/maint-add-i
g
nored-
d
ir'
commit
|
commitdiff
|
tree
2010-03-20
J
u
nio C Hamano
Merge branch 'ml/color-gr
e
p
'
commit
|
commitdiff
|
tree
2010-03-20
Junio C
Ham
a
no
Merge branch
'jc/color-attrs'
commit
|
commitdiff
|
tree
2010-03-20
J
unio C Hamano
Merge b
r
anch
'
c
c/reset-kee
p
'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Mer
g
e
b
r
a
nch 'fl/askpass'
commit
|
commitdiff
|
tree
2010-03-20
Jun
i
o C Hamano
Mer
g
e branch 'bg/apply-fix-blank-at-eof'
commit
|
commitdiff
|
tree
2010-03-20
J
u
n
i
o C
Hamano
Merge
b
r
a
nc
h
'b
w
/union-merge-r
e
fa
c
tor'
commit
|
commitdiff
|
tree
2010-03-20
J
u
n
io C Hamano
Mer
g
e
branch 'ma
i
n
t'
commit
|
commitdiff
|
tree
2010-03-20
Juni
o
C Hama
n
o
Upd
a
te draft release notes to 1
.
7
.
0
.
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Christian Coud
e
r
rebase -i
:
use n
e
w --ff cherry-pick option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
And
r
ea
s
G
ruenbach
e
r
f
e
tch:
Fix minor m
e
mory le
a
k
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Andreas Gruenbacher
fetch
:
Future-proof initialization of a refspec on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
An
d
reas Gruen
b
ache
r
f
e
t
c
h:
Check for a
"
^
{
}" suffix with suff
i
xcmp()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2010-03-20
Benjamin C Meye
r
Fix
a
spell
i
ng mistak
e
in a git-p4
c
o
n
sole me
s
sage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next