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
sha1_file: typofix
2011-05-15
Jun
i
o C Hamano
sha
1
_file
:
typofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Jo
n
at
h
an Nieder
add, m
e
rg
e
, d
i
ff: do not use strcasecmp to comp
a
re
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C
H
amano
Prepare for 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io
C
Hamano
Merge branc
h
'aw/maint-r
e
base-i-p-n
o
-ff' into maint
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C Ham
a
no
Merge
b
r
a
n
ch 'js/blame-
p
a
r
s
ename
'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
M
erge branch 'gr/cvsimport-alternat
i
ve-cvspass-location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
ma
n
o
Merge branch
'
cj/p4mer
g
e
'
into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-13
J
un
i
o C Ha
m
ano
Merge branch 'jk/
m
erge
-
one
-
f
i
le-working-tree'
into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C
Hama
n
o
Merge
b
r
an
c
h 'jc/fix-diff-files-
u
nm
e
r
g
ed
'
int
o
maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge
branch
'
mz/
m
a
in
t
-re
n
am
e
-un
m
erged'
i
n
to maint
commit
|
commitdiff
|
tree
2011-05-13
J
ohan H
e
rland
t5400: Fix a couple of
typos
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
J
oão Britto
Remove duplicated
"
is a"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Junio
C Hama
n
o
t3701
:
f
i
x here document
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Michael
J
Gruber
git-fa
s
t-import
.
txt: -
-
re
l
ative-
m
arks
t
akes no
p
arame
t
er
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Dima Sharov
s
h
e
ll: add mis
s
ing initial
i
zation of argv0_pat
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
B
rian
G
ernhardt
t/ann
o
t
a
t
e-tests: Use echo & ca
t
inst
e
ad of
s
ed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
mano
Git 1
.
7
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
J
unio C Hamano
Merge branch 'jh/dirstat'
i
n
t
o ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
e
r
g
e
b
ranc
h
'sp/mai
n
t-clear-postfields'
i
n
to maint
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C Ha
m
a
no
Me
r
ge bra
n
ch 'jk/maint-stash-oob' into
m
aint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge
b
ranc
h
'jk/maint-
u
pload-pack-shallow' into maint
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C Ham
a
no
Merge branch 'dm/stash-k-i-p'
into
maint
commit
|
commitdiff
|
tree
2011-05-04
J
unio
C
Hamano
Merge branch 'jc
/
pack-objects-bigfile'
into main
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Mer
g
e branch 'mg/reflog-with-options' into maint
commit
|
commitdiff
|
tree
2011-05-04
J
un
i
o
C Ham
a
n
o
Merge
b
ranch 'jk/stash-loos
e
n-safety' into maint
commit
|
commitdiff
|
tree
2011-05-04
J
un
i
o
C
Ham
a
no
M
erge branch '
a
r
/clea
n
-rmdir-empty' into maint
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C Hamano
Merge branch 'mg
/
sh
a
1-
p
ath-adv
i
se
'
into
m
aint
commit
|
commitdiff
|
tree
2011-05-04
Valent
i
n Haenel
gi
t
-add
.
txt: document 'add
.
ignoreErrors'
Noticed-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Ciaran Jessu
p
Pass
empty file
t
o p4merge where no
ba
s
e
i
s
suitable
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Guy Rouillier
Loo
k
for passwo
r
d in bot
h
C
V
S and CVSNT
p
assw
o
r
d
f
i
l
e
s
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Je
f
f King
merge-one-file: f
i
x broken
m
erges
w
i
th
a
lternate work
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
eff Ki
n
g
ad
d
t
ests for merge-index / merge-one-file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hama
n
o
Start 1
.
7
.
5
.
1 ma
i
nte
n
ance track
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C Hamano
Merge branch 'mg/x-years-
1
2
-
months'
int
o
maint
commit
|
commitdiff
|
tree
2011-04-29
Sylvain
R
abo
t
git-send-email: fix mi
s
sing space
i
n
error
m
essage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Josh Stone
blam
e
:
t
ole
r
a
te
b
o
g
u
s
e-mail addresses a bit better
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-28
A
nd
r
ew Wong
git-r
e
base--interactive
.
s
h: preserve-merge
s
fails
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
J
u
nio C Hamano
htt
p
: cle
a
r POSTFIELDS when
initializing a slot
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
unio C Ham
a
n
o
Git 1
.
7
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Ju
n
io C H
a
mano
diff-files: show unmerged
e
ntries
correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
diff: re
m
ove of
t
en unused para
m
et
e
r
s
fro
m
diff_unmerge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
d
iff
.
c:
return fil
e
pai
r
from diff_unmerge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
u
nio C H
a
mano
test: use $_z40 fro
m
tes
t
-lib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-21
Michael J
Gruber
date: avoi
d
"X y
e
ars
,
12
m
o
nth
s
" in rela
t
ive dates
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Ju
n
io C Hamano
Git 1
.
7
.
5-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio C H
a
m
ano
Sync
w
ith 1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio C
Hamano
G
i
t 1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
M
ichael J Gruber
g
i
t-
s
v
n
.
tx
t
: Document --me
r
ge
i
nfo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-18
J
un
i
o C H
a
mano
Revert
"
run
-
comma
n
d: prettify -D_FOR
T
IFY_SOU
R
CE worka
r
ound"
commit
|
commitdiff
|
tree
2011-04-14
J
unio
C
Hamano
M
erg
e
b
ra
n
ch
'maint'
commit
|
commitdiff
|
tree
2011-04-14
René Scharfe
archiv
e
:
document limitation of
ta
r
.
um
a
sk co
n
fig setting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Michael J Gruber
t3306,t5304: avoid
c
lock ske
w
issu
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Mic
h
ael J
Gruber
git
.
txt: fix list c
o
ntinuat
i
on
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
J
u
n
i
o C Hamano
Git
1
.
7
.
5
-
rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
Merge
b
ranch 'm
a
int'
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
Mer
g
e b
r
anch
'jc/rev-list-op
t
i
ons-f
i
x'
i
nto
m
a
i
n
t
commit
|
commitdiff
|
tree
2011-04-13
Junio C Ha
m
ano
M
erge branch 'js/checkout-
u
ntracke
d
-symlink
'
into
maint
commit
|
commitdiff
|
tree
2011-04-13
Jim Meyering
remove do
u
ble
d
words,
e
.
g
.
,
s/
t
o to/t
o
/, a
n
d fix related
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Ramkum
a
r Ra
m
a
c
hand
r
a
revert: Hide '-r' option in default us
a
g
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
J
o
h
an He
r
land
--dirstat: In c
a
se of ren
a
mes, use ta
r
get
f
il
e
name
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
J
u
n
i
o
C Hama
n
o
Merg
e
b
ranch 'js/che
c
kout-untrack
e
d-symlink'
commit
|
commitdiff
|
tree
2011-04-12
Junio
C Hamano
Merge branch 'nd/
i
nit-gitdir'
commit
|
commitdiff
|
tree
2011-04-12
Joh
a
nn
e
s
S
i
x
t
t20
2
1:
mark a
t
est as fixed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
J
o
hannes
Sixt
t0001: guard
a new t
e
s
t
with SYML
I
NKS prerequ
i
site
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
J
ohan
Herland
T
e
a
ch --dirstat not to completely ignore re
a
rranged
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Ævar Arnfjörð
B
jarmaso
n
Makefile: ex
t
r
act Q
_
() source strings a
s
ng
e
ttext()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Ramsay Jones
i
1
8
n: avoid par
e
nthesized str
i
ng as
a
rray initializer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Johan
Herland
--dirstat-by-file:
Make it
faster and more correct
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dirstat: Describe non-
o
bvious di
f
ferences relative
.
.
.
Improved-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
J
unio C Hamano
M
erg
e
g
i
t
://g
i
t
.
b
ogomips
.
org/gi
t
-s
v
n
commit
|
commitdiff
|
tree
2011-04-11
Junio C Ha
m
a
no
Merg
e
gi
t
:/
/
gi
t
.
ker
n
el
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2011-04-07
Dan McGee
stash
:
e
nsur
e
--no-
k
e
ep-index and
-
-patch can
be u
s
ed
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-07
Dan McGee
s
t
ash: add t
w
o more tes
t
s fo
r
--no-keep-index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-07
Andr
e
w
Gar
b
er
g
it-p4
:
replace each t
a
b with 8 spaces for consistency
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
upload-p
a
ck: start pa
c
k-obj
e
cts be
f
ore async r
e
v-list
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Juni
o
C Haman
o
Git
1
.
7
.
5-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hama
n
o
Syn
c
with 1
.
7
.
4
.
4
commit
|
commitdiff
|
tree
2011-04-06
Junio C
Hamano
Git 1
.
7
.
4
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Jun
i
o
C
Hamano
Merge
b
ran
c
h 'nm/ma
i
nt-
c
onflicte
d
-
submodul
e
-
e
ntries
.
.
.
commit
|
commitdiff
|
tree
2011-04-06
Ju
n
io C Hamano
Merge br
a
n
ch 'mg/rev-list-n-reverse-doc'
into
main
t
commit
|
commitdiff
|
tree
2011-04-06
Juni
o
C Ha
m
ano
M
e
r
ge branch 'jk/maint-remote-mi
r
r
or
-
safer'
commit
|
commitdiff
|
tree
2011-04-06
Junio
C
Hamano
Merge bra
n
ch 'mg/doc-revisions-txt'
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
s
t
ash:
d
rop dirty
w
or
k
tree
c
h
ec
k
on
a
p
ply
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Jun
i
o C
Hamano
Teach core
.
bigfilethre
a
shold to pack-obj
e
cts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Jon Seymour
sta
s
h: fix f
a
lse
p
osi
t
iv
e
in
the
invalid ref test
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
J
e
ff King
st
a
sh
:
fix accide
n
t
al a
p
ply
o
f non-e
x
istent stashes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-04
Micha
e
l J Gruber
revision
s
.
tx
t
:
l
angua
g
e i
m
provements
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-04
Ju
n
io C Ham
a
no
M
erge
bra
n
c
h
'maint
'
commit
|
commitdiff
|
tree
2011-04-04
Junio C
Haman
o
M
erge branch 'jl/submodule-fetch-on
-
demand'
commit
|
commitdiff
|
tree
2011-04-04
J
u
n
i
o C
Haman
o
Merge
br
a
nc
h
'jc/rev-
l
ist-opt
i
ons
-
fix'
commit
|
commitdiff
|
tree
2011-04-04
SZEDER
G
áb
o
r
Documen
t
ation: trivia
l
gr
a
mmar fix in core
.
worktree
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-04
Jakub Narebski
gitweb: Fix parsing of neg
a
t
i
v
e fractional
t
imezones
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-04
Junio C
Hamano
Merge b
r
a
n
c
h
'nm/maint-conflicted-submodule-entries'
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
M
erge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2011-04-03
Junio C Ham
a
n
o
S
t
art pre
p
a
r
ing for 1
.
7
.
4
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-03
Jeff
K
i
ng
pull: do no
t
c
l
obb
e
r untracked files on
initial pull
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-03
Junio
C
Hamano
Merge bra
n
c
h '
j
c/index-update-if-able' into m
a
int
commit
|
commitdiff
|
tree
2011-04-03
Junio C H
a
ma
n
o
Merge branch 'lt/def
a
ult-abbrev' into maint
commit
|
commitdiff
|
tree
2011-04-03
J
unio C Hamano
Mer
g
e branch 'j
c
/maint-rev-list-cu
l
led-bou
n
dary
'
into
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Junio C
H
aman
o
Merge
b
r
a
n
c
h 'mm/
m
a
i
nt-log-n-with
-
d
i
ff-filteri
n
g' i
n
to
.
.
.
commit
|
commitdiff
|
tree
next