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
Junio C Hamano
M
erge br
a
n
c
h 'mg/use-defa
u
l
t
-
abb
r
ev-length
-
in-
r
ev-list'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
Merge branch 'mg/maint-
s
end-email-lazy-editor'
commit
|
commitdiff
|
tree
2010-04-03
J
un
i
o C Ham
a
no
Merg
e
b
r
anch 'rb/mai
n
t-py
t
h
on-
p
ath'
commit
|
commitdiff
|
tree
2010-04-03
Ju
n
i
o C Haman
o
Merge bran
c
h 'jn/m
e
rge-dif
f
3-
l
abel'
commit
|
commitdiff
|
tree
2010-04-03
Jun
i
o C
H
a
mano
Merge br
a
nch 'ef/cherry-
a
bbre
v
'
commit
|
commitdiff
|
tree
2010-04-03
Junio C
Hamano
M
e
rge branch 'b
w
/templat
e
-tool-buildco
n
fi
g
'
commit
|
commitdiff
|
tree
2010-04-03
Jun
i
o C H
a
m
ano
M
e
rge
b
ranch 'mg/mai
l
map
-
update'
commit
|
commitdiff
|
tree
2010-04-03
Junio C
Ham
a
no
Mer
g
e branch 'bc/t55
0
5-fix'
commit
|
commitdiff
|
tree
2010-04-03
Junio
C
Hama
n
o
M
e
rge branch 'gh/
m
aint-
s
ta
s
h-show-error-me
s
sage'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Ha
m
a
no
M
erge branc
h
'rs/
t
hreaded-grep-con
t
ext'
commit
|
commitdiff
|
tree
2010-04-03
Junio
C
Hamano
Merge
branch 'bc/m
a
int-daemon-sans-ss-family'
commit
|
commitdiff
|
tree
2010-04-03
Junio C H
a
m
a
no
Merge branch 'bc/
a
cl-test'
commit
|
commitdiff
|
tree
2010-04-03
Junio C
H
a
mano
M
e
rge branch 'ja/send-email-ehlo'
commit
|
commitdiff
|
tree
2010-04-03
J
unio
C Hamano
Mer
g
e
b
r
a
n
ch 'do/re
b
as
e
-i-arbitra
r
y'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
Mer
g
e bra
n
c
h 'ak/everyday-gi
t
'
commit
|
commitdiff
|
tree
2010-04-03
Jonath
a
n Nieder
Makefil
e
: f
u
t
u
re-proof
Cygwin version check
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-03
YONETANI Tom
o
ka
z
u
Fix _XOPEN_SOU
R
CE proble
m
on DragonFly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-02
Ma
r
kus Heidelb
e
rg
builtin/
c
o
m
mit:
remove unnecessary
v
a
ri
a
ble defi
n
ition
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-02
Ma
r
kus Heide
l
berg
bui
l
tin/commi
t
:
f
i
x
duplicat
e
d
s
entence in a comment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-02
Eric Raymo
n
d
Inte
g
rate version 3 ciabot scripts into
contrib/
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-02
Er
i
c Blake
M
a
kefile
:
update d
e
fau
l
ts
f
or
m
o
dern C
y
gwin
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
Juni
o
C Ham
a
no
S
ync with 1
.
7
.
0
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
Juni
o
C Hamano
Git
1
.
7
.
0
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
Ju
n
io
C Hamano
M
erge branch 'jc
/
m
aint-refs-
d
a
n
gling' into
m
a
int
commit
|
commitdiff
|
tree
2010-03-31
Holge
r
W
e
iß
Docum
e
n
tation: show
-
ref <pattern>s
a
re optio
n
al
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
H
o
lger Weiß
Link aga
i
n
s
t libiconv on
I
RIX
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
Holger Weiß
D
o
n
't re
d
efin
e
htonl and ntohl on big-en
d
ian
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
Ja
k
ub Narebski
g
itweb:
g
it_g
e
t_proj
e
c
t
_config requires only $git_dir
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
Jan Stę
p
i
e
ń
U
p
d
ated the usage str
i
ng o
f
git reset
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-30
Greg
Bacon
Documentat
i
on:
C
l
arify support for
smart HTTP backend
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-30
Johannes Si
x
t
W
indows: f
i
x ut
i
me() for read-only f
i
les
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-30
Jo
h
annes Sixt
diff: fix tex
t
conv error zomb
i
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-30
Ju
n
io C Hamano
Merge br
a
nch
'
m
a
int'
commit
|
commitdiff
|
tree
2010-03-30
Kevin Ballard
format-patch
:
Squelch 'fatal: Not a range
.
" error
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-29
Junio
C Hamano
U
p
date dr
a
ft release notes to 1
.
7
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-29
J
unio
C
Hamano
Merge
b
ranch 'cc/cherr
y
-pick
-
ff'
commit
|
commitdiff
|
tree
2010-03-29
Junio C
H
amano
Merge branch 'sb/notes-p
a
rse-o
p
t'
commit
|
commitdiff
|
tree
2010-03-29
Juni
o
C Hamano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2010-03-29
Thomas Rast
reb
a
se
-i
:
make post-rewrite work for
'
edit'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-29
Jun
i
o C
Hama
n
o
P
r
epare for 1
.
7
.
0
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-29
Ju
n
i
o C Hamano
Merg
e
branch 'cp/add-u-pathspec' into maint
commit
|
commitdiff
|
tree
2010-03-29
Junio C Ham
a
n
o
Merge
b
ranch 'mai
n
t
'
commit
|
commitdiff
|
tree
2010-03-29
Junio
C
Ha
m
ano
t9350: f
i
x
careless 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
i
ff
.
guit
o
ol i
s
unco
n
figured
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-28
Sverre Rabbelier
fast-export: don't
s
egfault when marks file cannot
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-28
Chris
Web
b
imap
-
send: supp
r
ess warning
a
b
o
u
t cleartext passwo
r
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-25
Mic
h
ael J Grub
e
r
send-ema
i
l: lazily assign editor v
a
riable
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-24
Jun
i
o C Ha
m
ano
M
erge bran
c
h 'jh/m
a
i
n
t-s
u
b
m
od
u
l
e
-sta
t
us-in-void'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hamano
Merge b
r
anch 'tr/no
t
es-display'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Ham
a
no
Merge bran
c
h 'jl/submodul
e
-diff-di
r
tiness'
commit
|
commitdiff
|
tree
2010-03-24
Junio
C H
a
mano
Merge branch 'pb/lo
g
-first-parent-p-m'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hamano
Merg
e
b
ra
n
ch 'jc/m
a
int-refs-dangling'
commit
|
commitdiff
|
tree
2010-03-24
Junio C
Hamano
Mer
g
e bran
c
h '
m
aint'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Ha
m
ano
Merge branch 'jc
/
c
o
lor-attrs' into maint
commit
|
commitdiff
|
tree
2010-03-24
Juni
o
C Ha
m
ano
M
erg
e
b
ranch 'jk/main
t
-
a
dd-ignored-
d
ir' into maint
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hamano
Merge b
r
anch 'bg
/
apply-fix-blan
k
-at-eof' i
n
t
o
maint
commit
|
commitdiff
|
tree
2010-03-24
R
.
Tyler
Ballance
Correct references to
/usr/bin/pyt
h
o
n
w
hich does not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-24
Ma
r
kus Hei
d
elbe
r
g
Documentation: explain the meaning
of "
-
g" in git-describ
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-24
Michael J Gr
u
ber
rev-list: use
d
efa
u
lt a
b
br
e
v length when abbrev-co
m
mit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-22
J
unio
C
Hamano
Sync
w
ith Git
1
.
7
.
0
.
3
commit
|
commitdiff
|
tree
2010-03-22
J
u
nio
C Hama
n
o
Git
1
.
7
.
0
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-22
Junio C Hamano
Me
r
ge bran
c
h
'
m
aint-
1
.
6
.
6' into maint
commit
|
commitdiff
|
tree
2010-03-21
Michael J Gruber
.
ma
i
l
m
ap: Map
t
he the fir
s
t submissions of MJG by e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Erik Faye-
L
un
d
ls
:
remove
r
e
d
undant
logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
E
r
ik Faye-Lund
cherry: suppo
r
t
--abbr
e
v
o
pti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Mich
a
el
J
G
rub
e
r
Do
c
umentation/g
i
t
-
clone:
Transform description list
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Michael
J
Gruber
Document
a
t
i
on/url
s
: Remove spurio
u
s e
x
amp
l
e markers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Michael J G
r
uber
Docum
e
nta
t
ion/gi
t
diffcore: Remove misleading date in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Michael
J
G
ruber
Docu
m
e
ntation/git-reflog: Fix formatting of command
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Niede
r
merge
-
recursi
v
e: a
d
d
a label f
o
r ancestor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
than Nieder
cherry-pick, reve
r
t: add a label for ancestor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
r
evert: clarif
y
label on con
f
l
ict hunks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
N
i
e
der
compat: add
memp
c
py()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
che
c
kout
-m --
c
onflict=diff3:
a
dd a label for ancestor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n
Ni
e
de
r
m
e
rge_trees(): add ancestor label
p
aramet
e
r for diff
3
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
merge_file(): add
commen
t
explaining behavior
wrt c
o
n
fl
i
ct
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nathan Nieder
c
h
eckout --co
n
f
lict=
d
iff3: add
a label for anc
e
s
tor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
ll_merge():
a
dd a
n
ces
t
or la
b
e
l
parameter for diff3
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
han Nieder
merg
e
-
file --diff3: add a label for ancestor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
x
d
l_merge(): mo
v
e fil
e
1 an
d
f
i
le2 l
a
bels to xmparam
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
xdl_mer
g
e():
a
dd optional ancesto
r
label to diff3-style
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
te
s
t
s: document cherry-pick behavior in face of
c
onf
l
ic
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
n
athan Nie
d
er
t
ests: doc
u
ment format of conflict
s
from checkout -m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
M
i
chael J Gruber
.
m
a
ilmap:
E
n
t
rie
s
for Alex Bennée, Deskin
M
iller, Vitaly
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
re
v
ert: fix tin
y
memory leak in cherry-pick --ff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Update draft release notes to 1
.
7
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Junio
C Hamano
Merg
e
branch 'jk/m
a
int-ad
d
-ignored-dir'
commit
|
commitdiff
|
tree
2010-03-20
Junio C
H
a
m
ano
Merge
b
ranch
'
ml
/
c
o
lor-grep'
commit
|
commitdiff
|
tree
2010-03-20
J
u
ni
o
C
Hamano
Merge
branch 'jc/
c
olor-attrs'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hama
n
o
M
e
r
ge bra
n
ch 'cc/reset-
k
eep'
commit
|
commitdiff
|
tree
2010-03-20
J
unio C
H
amano
Me
r
ge branc
h
'f
l
/askpass'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Ham
a
no
M
erge branch
'
bg/apply-fix-b
l
ank-at-eof'
commit
|
commitdiff
|
tree
2010-03-20
Junio
C
H
amano
Merge br
a
n
ch 'bw/union-merge
-
re
f
actor
'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Merge branch 'mai
n
t'
commit
|
commitdiff
|
tree
2010-03-20
Jun
i
o C H
a
mano
Update
draft re
l
ease
n
otes to
1
.
7
.
0
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
C
h
r
istian Couder
rebase
-i: use new
-
-ff cherr
y
-pi
c
k opti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
And
r
e
a
s Gruenbacher
fetch: Fix m
i
nor
m
emory leak
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Andreas Gruenbache
r
f
e
tch: Future
-
pro
o
f ini
t
i
a
l
i
zation of
a
refspec on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
A
n
dreas Gruenbacher
fetch: Check
f
o
r
a "^{}" suffix with suf
f
ix
c
mp(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Ben
j
amin C Meyer
Fix a sp
e
ll
i
ng mista
k
e in a
g
it-p4 consol
e
m
essage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next