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 'mb/rebase-i-no-ff'
2010-04-03
J
unio C Hama
n
o
Mer
g
e
bran
c
h 'mb/rebase
-
i
-no-ff'
commit
|
commitdiff
|
tree
2010-04-03
Junio C
Hamano
Merge
b
ranch 'sp/maint
-
h
t
tp-backend-d
i
e-tr
i
g
g
e
rs
-
d
ie
.
.
.
commit
|
commitdiff
|
tree
2010-04-03
J
unio
C
Hama
n
o
Merge br
a
nch 'rr/
i
map
-
se
n
d-unconfu
s
e-from-line'
commit
|
commitdiff
|
tree
2010-04-03
Ju
n
io C Hamano
Merge
b
r
anch
'mg/use-default-abbr
e
v-le
n
gth-i
n
-r
e
v-
l
is
t
'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Ha
m
ano
Merg
e
branch 'mg/maint-s
e
n
d
-em
a
il-lazy-editor'
commit
|
commitdiff
|
tree
2010-04-03
J
unio C Hamano
Merge
b
ranch 'rb/maint-
p
yth
o
n
-path'
commit
|
commitdiff
|
tree
2010-04-03
Junio
C
Hamano
Merg
e
branch 'jn/me
r
g
e
-diff3
-
label'
commit
|
commitdiff
|
tree
2010-04-03
Ju
n
io
C Ham
a
n
o
Mer
g
e
b
ranc
h
'ef/cherry-abbrev'
commit
|
commitdiff
|
tree
2010-04-03
J
unio C Hamano
Merge branch
'
bw/template-tool-
b
uildconfig'
commit
|
commitdiff
|
tree
2010-04-03
J
unio
C Hamano
Me
r
ge branch 'm
g
/mailmap-u
p
date'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Ha
m
a
n
o
Merge branch 'bc/t5505-fix'
commit
|
commitdiff
|
tree
2010-04-03
Juni
o
C H
a
man
o
Merge br
a
nch 'gh/maint-st
a
sh-show-
e
rror-mes
s
a
g
e'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
Merge branch
'
r
s
/threaded-
g
rep-con
t
ext'
commit
|
commitdiff
|
tree
2010-04-03
J
unio C Hamano
Merge bra
n
c
h 'bc
/
m
ai
n
t-daemon-san
s
-ss
-
family'
commit
|
commitdiff
|
tree
2010-04-03
Juni
o
C Hamano
Me
r
ge b
r
anch 'bc/acl-test'
commit
|
commitdiff
|
tree
2010-04-03
Ju
n
io C Hamano
Merge bra
n
ch 'ja/sen
d
-
emai
l
-ehlo
'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
Merge branch 'do/r
e
base-i-arbitr
a
ry'
commit
|
commitdiff
|
tree
2010-04-03
Junio
C Ha
m
an
o
Me
r
ge branch 'ak/everyday-git
'
commit
|
commitdiff
|
tree
2010-04-03
Jonathan Niede
r
Makefi
l
e:
fu
t
ure
-
pro
o
f Cygwin v
e
r
s
ion check
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-03
YONETANI Tomokazu
Fix _XOPEN_SOURCE problem on D
r
a
g
onF
l
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-02
Markus Hei
d
elbe
r
g
builtin/c
o
mmit: remove unnec
e
ssary
variabl
e
definition
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-02
Markus
Heidel
b
erg
bui
l
tin/c
o
mmit:
f
ix duplic
a
t
ed sentence in a
c
omment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-02
Eric Raymond
I
ntegrate
version 3 cia
b
ot scripts into contrib/
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-02
Er
i
c B
l
ake
M
akefile
:
update defaults fo
r
mo
d
ern Cy
g
win
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
Ju
n
io C Haman
o
Sync
w
ith 1
.
7
.
0
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
Junio
C
Hamano
Git 1
.
7
.
0
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
Junio C Hama
n
o
Merge branch 'jc/maint-r
e
fs-dangling'
i
nto
m
aint
commit
|
commitdiff
|
tree
2010-03-31
H
o
lger Weiß
Documenta
t
i
o
n: show-ref <pattern>s are
opt
i
onal
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
Holger Weiß
L
ink against lib
i
conv o
n
IR
I
X
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
Holger Weiß
D
on't redefine
htonl and n
t
ohl o
n
big-endian
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
J
a
kub Narebsk
i
gitweb: git_get_proj
e
ct_config requires o
n
ly $gi
t
_
dir
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
Jan S
t
ępień
U
pdated
t
he usage string of git reset
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-30
Greg
B
acon
D
o
cu
m
entation: Clarify support for sm
a
rt HTTP backend
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-30
Johannes Sixt
W
indo
w
s: fix utime() f
o
r
r
ead-only files
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-30
J
o
hanne
s
S
i
x
t
d
iff: fix te
x
tconv error zomb
i
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-30
J
unio C Hamano
Merge br
a
nc
h
'maint'
commit
|
commitdiff
|
tree
2010-03-30
K
evin Ba
l
lard
format-
p
a
t
ch: Sq
u
elch 'fata
l
: Not a ran
g
e
.
"
error
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-29
J
u
nio C Ha
m
a
n
o
U
p
d
ate
d
r
aft release notes to 1
.
7
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-29
Junio C Hama
n
o
Merge branc
h
'cc/cherry-pick-ff'
commit
|
commitdiff
|
tree
2010-03-29
Juni
o
C
H
amano
Merge br
a
n
c
h 's
b
/notes-parse-o
p
t'
commit
|
commitdiff
|
tree
2010-03-29
Junio C Hama
n
o
Merge
b
r
anch '
m
a
i
nt'
commit
|
commitdiff
|
tree
2010-03-29
Thomas
Rast
r
e
base
-i: m
a
ke
post-rewr
i
t
e
wor
k
for 'edit'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-29
Junio C Ha
m
ano
Prepare for 1
.
7
.
0
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-29
J
u
nio C
Haman
o
Mer
g
e branch 'cp/add-
u
-pathspec' in
t
o maint
commit
|
commitdiff
|
tree
2010-03-29
Junio C
Hamano
Merge
b
ran
c
h 'm
a
i
nt'
commit
|
commitdiff
|
tree
2010-03-29
Ju
n
io C Hamano
t
9
350: fix carel
e
ss
u
s
e of "cd
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-28
D
a
vi
d
A
guilar
difftool: Fix '--g
u
i'
when diff
.
gu
i
to
o
l is u
n
conf
i
g
ured
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-28
Sverre Rabbe
l
ier
fast-export: don't seg
f
ault
w
h
en marks f
i
le canno
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-28
Chris
Webb
im
a
p-send: su
p
pre
s
s warning about cleartext password
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-25
Michael J Gruber
se
n
d
-
email
:
lazily assign
editor v
a
ri
a
ble
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-24
Junio
C H
a
mano
Merge branch 'jh
/
ma
i
nt-submodule-status-i
n
-void'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Haman
o
Merge
b
r
a
nch 'tr/no
t
es-di
s
play'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Ha
m
a
no
Merge
b
r
anch 'jl/sub
m
odule-diff-dirti
n
ess'
commit
|
commitdiff
|
tree
2010-03-24
Junio
C
Ha
m
ano
M
e
rge branch 'pb
/
log-first-par
e
nt-p-
m
'
commit
|
commitdiff
|
tree
2010-03-24
Ju
n
i
o C Hamano
Merge branch '
j
c/mai
n
t-refs-
d
angling'
commit
|
commitdiff
|
tree
2010-03-24
J
unio C Hamano
Merge branch '
m
a
i
nt'
commit
|
commitdiff
|
tree
2010-03-24
J
u
nio C Hamano
Merge branch 'jc/color-attrs' i
n
to maint
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hamano
Me
r
ge branch 'jk/
m
aint-
a
d
d
-i
g
nored-dir' into maint
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hamano
Merge
b
r
anch 'bg/apply-fix-blank-at-eof' i
n
to maint
commit
|
commitdiff
|
tree
2010-03-24
Marc
Branchaud
Teach rebase
t
h
e
--no-ff option
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-24
Shawn O
.
Pearce
h
ttp-b
a
ckend:
D
on
'
t
i
n
fini
t
e lo
o
p during
d
i
e
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-24
R
.
Tyler Ba
l
lan
c
e
Cor
r
ect references to /usr/bi
n
/
p
ython wh
i
ch
does not
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-24
Ma
r
kus Heidelberg
Docu
m
entatio
n
: exp
l
a
i
n the mean
i
ng of "-
g
" i
n
git-describe
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-24
M
ich
a
el J Grub
e
r
rev-list: use def
a
ult abbrev
l
en
g
t
h when abbrev-commit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-24
Ramkumar Ramac
h
andra
imap
-
s
e
nd
:
Remo
v
e limitation on mes
s
age body
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-22
Junio C Hama
n
o
Sync wit
h
G
it
1
.
7
.
0
.
3
commit
|
commitdiff
|
tree
2010-03-22
J
u
nio C
Ha
m
ano
Git
1
.
7
.
0
.
3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-22
Juni
o
C
H
amano
Me
r
ge branch 'maint-1
.
6
.
6' into ma
i
nt
commit
|
commitdiff
|
tree
2010-03-21
Micha
e
l J Gruber
.
mailmap: Map the
the
f
irst submis
s
ions of MJG by e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Erik Faye-Lund
ls: remove r
e
dun
d
ant logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Erik Fay
e
-Lund
cherry: support
-
-
abbre
v
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Michae
l
J
G
rub
e
r
Documentation
/
git-clone: Transform
d
escription list
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Mic
h
ael J
G
ruber
Documen
t
at
i
o
n
/urls: Remove
spurious ex
a
m
p
le m
a
r
k
ers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Mic
h
ael J Grub
e
r
Docu
m
e
ntation/
g
itdiffc
o
re: Remove
m
i
s
l
eadi
n
g
d
a
te in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Mi
c
hael J Gruber
Documentation/git-ref
l
og: Fix formatting of co
m
mand
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
mer
g
e-r
e
curs
i
ve: add a
la
b
el for an
c
estor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
cherry-pick, revert: add
a label fo
r
an
c
e
stor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nathan Nieder
revert: clarify label o
n
conflict
h
unks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
atha
n
Nieder
compat: a
d
d
m
empcpy()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
chec
k
out -
m
--conflict=diff3: add a l
a
bel fo
r
ancestor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Ni
e
der
me
r
ge_t
r
ees(
)
: add a
n
cestor
l
abel parameter for d
i
ff3
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
athan Nieder
m
erge_file()
:
add comment expla
i
ning behavior w
r
t conflict
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Ni
e
de
r
c
h
eckout -
-
conflic
t
=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
Jonathan Nieder
ll_merge(): add anc
e
s
t
or labe
l
parameter
for di
f
f3
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
J
on
a
than Niede
r
merge-f
i
le --diff3: a
d
d a label for ances
t
or
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
athan Nie
d
e
r
xdl_mer
g
e(): mov
e
f
ile1 and file2 labe
l
s to
x
mparam
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nathan Nie
d
er
xdl
_
mer
g
e
(): add optional a
n
cestor label to diff3-style
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n
N
i
eder
tests:
document cherry-pi
c
k
behavior in fac
e
of confli
c
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
na
t
han Nieder
t
e
s
ts:
do
c
ument format
o
f conflicts
from
c
heckout -m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Mi
c
hael J Gruber
.
mailmap
:
Entries for
A
lex Bennée
,
Deskin Miller
,
Vitaly
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n Nieder
reve
r
t: fix tin
y
mem
o
ry leak in cher
r
y
-p
i
ck --ff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Juni
o
C
Hamano
Update draft rele
a
se note
s
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/maint-add-ignor
e
d-dir'
commit
|
commitdiff
|
tree
2010-03-20
J
u
n
io C Ham
a
no
Merg
e
branch
'
m
l/color-
g
re
p
'
commit
|
commitdiff
|
tree
2010-03-20
J
u
n
io
C
Hamano
M
erge bra
n
c
h
'jc
/
color-a
t
trs'
commit
|
commitdiff
|
tree
2010-03-20
Junio C H
a
mano
M
e
r
g
e
branch
'
cc/reset-k
e
ep'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Mer
g
e branch '
f
l/ask
p
ass'
commit
|
commitdiff
|
tree
2010-03-20
Junio C
Hamano
Merge b
r
anch 'bg/apply-fix-blank-a
t
-eof'
commit
|
commitdiff
|
tree
2010-03-20
J
u
n
i
o
C Hamano
Mer
g
e branch 'bw/unio
n
-merge-refactor'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
next