repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'maint'
2010-04-04
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2010-04-04
Tay Ray C
h
uan
pack
-
protoco
l
.
tx
t
: fix pkt-line
l
eng
t
hs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-04
Tay R
a
y Chuan
pack-p
r
oto
c
ol
.
t
x
t: fix spelling
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-03
Ju
n
io C Ha
m
a
no
Merge branch 'mb/rebase-i-no-ff'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
Merge branch '
s
p
/
maint-http-backen
d
-di
e
-trigger
s
-die
.
.
.
commit
|
commitdiff
|
tree
2010-04-03
Junio C H
a
mano
Me
r
ge bran
c
h 'rr/imap-send-unco
n
fuse
-
from-line
'
commit
|
commitdiff
|
tree
2010-04-03
Jun
i
o C Hamano
Merge br
a
nch
'mg/use-default-abb
r
ev-leng
t
h-in-r
e
v-
l
ist'
commit
|
commitdiff
|
tree
2010-04-03
Junio C
Ham
a
no
Me
r
ge
b
r
a
nch
'mg
/
maint-send-email-lazy-edit
o
r
'
commit
|
commitdiff
|
tree
2010-04-03
Junio C H
a
mano
Merge bra
n
ch 'rb/maint-py
t
hon-path
'
commit
|
commitdiff
|
tree
2010-04-03
J
unio
C
Hamano
Merge branch '
j
n/
m
erge-diff3-label'
commit
|
commitdiff
|
tree
2010-04-03
Junio C H
a
m
ano
Merge branch 'ef/
c
h
e
r
ry-abbrev'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Ham
a
no
Mer
g
e b
r
a
n
ch 'bw/t
e
mplate-tool-bui
l
dconfig'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
Me
r
ge branc
h
'mg/
m
ailmap-update'
commit
|
commitdiff
|
tree
2010-04-03
J
unio C Hamano
Merge branch 'bc/t
5
505-fix'
commit
|
commitdiff
|
tree
2010-04-03
Junio
C
Hamano
Merge branch 'gh/maint-stash-show-error-message'
commit
|
commitdiff
|
tree
2010-04-03
Ju
n
io C Hamano
M
e
rge b
r
a
n
c
h
'rs/t
h
re
a
ded-grep-c
o
ntex
t
'
commit
|
commitdiff
|
tree
2010-04-03
Jun
i
o C Hamano
M
e
rg
e
bra
n
ch
'
b
c
/ma
i
nt-daemon-sans-ss-family'
commit
|
commitdiff
|
tree
2010-04-03
Ju
n
io C Hamano
Merge branc
h
'bc
/
acl-tes
t
'
commit
|
commitdiff
|
tree
2010-04-03
J
u
n
i
o C
Hamano
Merge bran
c
h
'ja/send-email-eh
l
o'
commit
|
commitdiff
|
tree
2010-04-03
Junio C Hamano
M
e
rge
b
ra
n
ch 'do/reb
a
se-i-arb
i
trary'
commit
|
commitdiff
|
tree
2010-04-03
J
unio C Hamano
Merge branc
h
'a
k
/ever
y
day-g
i
t
'
commit
|
commitdiff
|
tree
2010-04-03
J
o
nathan N
i
ed
e
r
Makefile: fut
u
re-proof Cygwin
v
ersion check
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-03
YONETANI Tomokazu
Fix _
X
OPE
N
_SO
U
RCE
problem on Dragon
F
ly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-02
Marku
s
Heidel
b
erg
bui
l
tin
/
commit: rem
o
ve unnecessary vari
a
b
le definition
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-02
M
ar
k
us He
i
del
b
erg
builtin/commit:
fix duplic
a
ted se
n
tence in a c
o
mment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-02
Eri
c
Raym
o
nd
Int
e
grate version 3 ci
a
b
ot scripts
i
nto contrib/
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-04-02
Eric
Blake
Makefil
e
:
u
pdate defaul
t
s for modern Cyg
w
in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
J
u
nio C Hamano
Syn
c
with 1
.
7
.
0
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
Junio C Ham
a
no
Git 1
.
7
.
0
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
Junio C Ha
m
ano
Merge bra
n
ch 'jc/mai
n
t-r
e
fs-dangling' into m
a
int
commit
|
commitdiff
|
tree
2010-03-31
Holge
r
Weiß
Documentation: show-ref
<pattern>
s
a
r
e optiona
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
Holger
Weiß
Li
n
k
agai
n
st libiconv on IRIX
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
Ho
l
g
er
W
eiß
Don'
t
red
e
fine hton
l
a
nd ntohl on
b
ig-en
d
ian
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
Jakub N
a
rebski
git
w
eb: git_get
_
p
roject_config requires only $git_dir
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-31
Jan
Stępień
Updated the usage s
t
ring of
git r
e
set
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-30
Greg Bacon
D
o
cumentation: Clari
f
y support
f
or s
m
art
H
TTP backend
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-30
Johannes Sixt
Wind
o
ws: fix
u
ti
m
e() for r
e
ad
-
only fi
l
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-30
Johan
n
es
S
ixt
diff: fix textco
n
v er
r
or
z
ombies
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-30
Junio C Hamano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2010-03-30
Kevin Bal
l
ar
d
for
m
at-patch: Squelch
'fatal:
N
o
t
a ra
n
ge
.
"
error
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-29
Junio C Hama
n
o
Update dra
f
t release notes to 1
.
7
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-29
Ju
n
io C Hamano
M
erge branch
'cc/c
h
e
r
r
y-pick-ff'
commit
|
commitdiff
|
tree
2010-03-29
Junio
C
H
amano
Merge branch 'sb/notes-parse-opt'
commit
|
commitdiff
|
tree
2010-03-29
J
unio C
H
amano
M
e
rge branch 'maint'
commit
|
commitdiff
|
tree
2010-03-29
T
h
omas R
a
st
rebase -
i
: make
p
ost
-
r
e
write
w
ork for 'edit'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-29
Junio C Haman
o
Prepare for 1
.
7
.
0
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-29
Junio C
Hamano
M
e
rge branch 'cp/add-u-pathspec' into maint
commit
|
commitdiff
|
tree
2010-03-29
Junio C H
a
mano
Merge b
r
anch
'maint'
commit
|
commitdiff
|
tree
2010-03-29
Ju
n
io
C
Hamano
t9
3
50:
fix careles
s
use o
f
"cd"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-28
D
avid
Aguilar
difftool: F
i
x
'-
-
g
ui' w
h
en
d
iff
.
g
u
i
tool is unconfig
u
r
e
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-28
Sverr
e
R
abbelier
fast-ex
p
ort: don't
segf
a
u
lt when
marks
fil
e
canno
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-28
C
hris Webb
imap-send: suppress warning about cl
e
artext p
a
s
sword
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-25
Michae
l
J Gruber
se
n
d
-
e
mail:
l
azily assign e
d
itor var
i
able
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-24
J
u
n
i
o C H
a
ma
n
o
Merge branc
h
'jh
/
mai
n
t
-sub
m
od
u
le
-
status-in-v
o
id'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hamano
Merge branch 'tr/notes-display
'
commit
|
commitdiff
|
tree
2010-03-24
Junio C
Haman
o
Merge br
a
nch 'jl/s
u
bmodule
-
diff-dirt
i
ness
'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Ha
m
a
n
o
M
erge br
a
nch 'pb/log-first-pare
n
t-p-m'
commit
|
commitdiff
|
tree
2010-03-24
Junio C Hamano
Me
r
g
e branch
'
jc/maint-refs-d
a
ngling'
commit
|
commitdiff
|
tree
2010-03-24
Ju
n
io C
Haman
o
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2010-03-24
Junio C H
a
mano
Mer
g
e
branch 'jc
/
color-attrs' in
t
o maint
commit
|
commitdiff
|
tree
2010-03-24
Junio C
H
ama
n
o
Merge br
a
nch 'jk/mai
n
t-add-ign
o
re
d
-di
r
' i
n
to m
a
int
commit
|
commitdiff
|
tree
2010-03-24
Juni
o
C H
a
mano
Merge br
a
nch 'bg/apply-fix
-
bla
n
k-at-eof' in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2010-03-24
Marc
Branchau
d
Teach
r
e
base
t
he --no-ff o
p
tion
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-24
Shawn O
.
P
earce
h
t
t
p-backend: Don't
i
nfini
t
e loop during die()
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 B
a
llanc
e
Corr
e
ct references to
/
usr/bin/
p
ython wh
i
ch does
n
ot
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-24
Markus Heidelberg
Doc
u
mentation: explain the meaning of "
-
g" in git-de
s
cri
b
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-24
Michael J Gruber
rev-li
s
t: use def
a
ult abbrev le
n
gth wh
e
n abbrev-co
m
mit
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-24
Ra
m
kumar Ramach
a
ndra
i
map-send:
R
emove limi
t
a
t
ion on
m
e
ssage body
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-22
Junio C
Hama
n
o
Syn
c
with
G
it 1
.
7
.
0
.
3
commit
|
commitdiff
|
tree
2010-03-22
Junio C Hamano
Gi
t
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 'mai
n
t-1
.
6
.
6' into maint
commit
|
commitdiff
|
tree
2010-03-21
M
ichael J
G
ruber
.
mailmap: Map
t
he
t
he first submiss
i
ons
of MJG by e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Erik Faye-Lund
ls: remove redundant logic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Er
i
k Faye-Lund
c
her
r
y
: supp
o
rt --abbre
v
option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Michael
J Gruber
Documentat
i
o
n/git-clone: Transform description
l
ist
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Mi
c
h
a
el J G
r
uber
Do
c
um
e
ntation/ur
l
s: Remove spuri
o
us example ma
r
kers
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Michael J Gruber
Documen
t
ation/gitdiffcore: Remove misleading
d
a
te in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Michael
J
Gruber
Do
c
u
mentat
i
on/
g
it-reflog: Fix formatt
i
ng of command
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
athan Nieder
mer
g
e-recursive: add a label f
o
r
a
nc
e
stor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
cher
r
y
-
pick, re
v
ert: ad
d
a label for an
c
e
stor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Ni
e
der
revert: clarify label on conflict hu
n
ks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
than Nieder
comp
a
t: add mempcp
y
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
at
h
an Nie
d
er
chec
k
o
ut
-
m
-
-
c
on
f
lic
t
=diff3: add a la
b
el
f
or
a
nces
t
or
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
an
Nieder
merge_tre
e
s(): add ancestor lab
e
l parameter for d
i
ff3
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
Nieder
merg
e
_fi
l
e(): add
c
omment explainin
g
behavior wr
t
con
f
lict
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nied
e
r
chec
k
out --conflic
t
=d
i
f
f
3
:
add
a lab
e
l for ancestor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
ll_merge():
a
dd ancesto
r
label parameter for diff3
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
J
on
a
than Nieder
merge-
f
ile --diff3: a
d
d
a label for
ancestor
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
han Nieder
xdl_merge(): move fil
e
1 and file2
l
abe
l
s to
x
mpa
r
am
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
n
athan Ni
e
der
xdl_merge(): add optional
a
n
cestor
l
a
bel to dif
f
3-s
t
yl
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan N
i
e
d
er
test
s
: document cherry-pick beh
a
vior in face of conflicts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
J
o
nat
h
a
n
N
i
eder
t
es
t
s: docum
e
n
t f
o
rmat of
conflicts from checkout -m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Michael J G
r
uber
.
mailmap: Entrie
s
f
or A
l
ex Be
n
née, De
s
kin Miller, V
i
taly
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-21
Jonat
h
an Nieder
reve
r
t: fix tiny memory l
e
ak i
n
cherry-pick
--ff
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
Junio
C
Hamano
U
pdate
d
raft release notes to 1
.
7
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2010-03-20
J
un
i
o C Hama
n
o
M
erge branch 'jk/mai
n
t-ad
d
-ign
o
red-di
r
'
commit
|
commitdiff
|
tree
2010-03-20
Ju
n
io C H
a
mano
Merge
b
ranch 'ml/colo
r
-
g
r
ep'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Hamano
M
erg
e
branch
'
jc/col
o
r-attrs'
commit
|
commitdiff
|
tree
2010-03-20
Junio C Ha
m
ano
Merg
e
b
r
anch 'c
c
/
reset-keep'
commit
|
commitdiff
|
tree
2010-03-20
Juni
o
C H
a
mano
Merge branch 'fl/askpass'
commit
|
commitdiff
|
tree
next