repo.or.cz
/
git
/
jrn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Prepare for 1.7.5.2
2011-05-13
Junio C Hamano
Prepare f
o
r 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ha
m
ano
Merge
b
ranch
'a
w
/maint-rebase-i-p-no-ff' int
o
maint
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C H
a
ma
n
o
M
e
rge branch
'js/blame-parsenam
e
' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-13
Junio
C Haman
o
Merge branch 'gr
/
c
vsimport-a
l
ternativ
e
-
c
v
spass-loc
a
tion
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C H
a
mano
M
e
rge br
a
nch 'cj/p4merge' into main
t
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branc
h
'jk/m
e
rge
-
one-file-wor
k
ing-tree
'
in
t
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge
b
ranch 'jc/fix-di
f
f-fil
e
s-u
n
merged' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-13
Junio
C Hamano
Merge branch 'mz/maint-rena
m
e-unmerged'
i
nt
o
maint
commit
|
commitdiff
|
tree
2011-05-13
Johan Herlan
d
t540
0
: Fix a coup
l
e of typos
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
J
oão Britto
Remov
e
dup
l
icated "is a"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Ham
a
no
t3701: fix here documen
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Mi
c
hael
J
Gruber
git-fast-import
.
txt: --re
l
ative-mar
k
s
takes n
o
pa
r
ameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Dima Sharov
sh
e
ll: add missing init
i
al
i
zati
o
n of argv0_path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
B
r
ian Gernhardt
t
/
annotat
e
-
t
e
s
ts: Use e
c
ho & ca
t
i
n
st
e
ad
o
f sed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
G
it
1
.
7
.
5
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
J
u
n
io C Hamano
Merge branc
h
'
jh
/
d
i
rstat' in
t
o mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch 'sp/maint-clear-
p
ostfields' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge br
a
nch 'jk/ma
i
nt-stash-oob' into maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Hamano
Merge branch
'
jk
/
ma
i
nt-upload-pack
-
shallow' into
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
e
rge branch 'dm/sta
s
h
-k-i-p' int
o
m
a
int
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
Merge branch 'jc/pack-o
b
jects-bigfile' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
m
a
no
Mer
g
e branch 'mg/refl
o
g-with
-
option
s
' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hama
n
o
Merg
e
branch 'jk/stash
-
l
o
o
sen-safety'
i
nt
o
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Haman
o
M
e
r
g
e branc
h
'ar/clea
n
-rmdir-empt
y
' i
n
to
m
aint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge
branch 'm
g
/sha1-pat
h
-advise' into maint
commit
|
commitdiff
|
tree
2011-05-04
Va
l
en
t
i
n
H
aenel
git-add
.
txt: document 'add
.
ignoreE
r
rors'
Noticed-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Ciaran Jessup
Pass e
m
p
t
y
file to p4merge w
h
er
e
n
o
base is suitable
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Guy R
o
uilli
e
r
Lo
o
k f
o
r passwo
r
d in both CVS
a
nd CVSNT pass
w
ord files
.
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 b
r
o
k
en me
r
ges with altern
a
te work
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jeff
K
ing
add tests for
m
erge-ind
e
x
/
merge-one-file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Juni
o
C H
a
m
ano
Star
t
1
.
7
.
5
.
1
maintenance trac
k
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
u
nio C Ham
a
no
Merge branch 'm
g
/x-year
s
-12-month
s
' into maint
commit
|
commitdiff
|
tree
2011-04-29
Sylvai
n
Rabot
git-s
e
nd-email: fix mi
s
sing sp
a
ce
i
n error message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
osh Stone
blame: tolera
t
e bo
g
us
e
-mail a
d
dress
e
s
a
b
it
b
ett
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-28
Andrew W
o
ng
g
it-rebase--inte
r
active
.
sh: pr
e
serv
e
-merg
e
s
fails on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
J
u
nio C
H
ama
n
o
http: cle
a
r
P
OSTFIELDS when in
i
tializing
a
s
l
ot
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio
C Hamano
Git 1
.
7
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
J
unio C Haman
o
d
iff-
f
i
les: show unmerged
entries correctl
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
J
u
nio C
Hamano
diff
:
remove often unused parameters from diff_unmer
g
e()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio
C
Hamano
dif
f
.
c
: return filepair from diff_unmer
g
e()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Ha
m
ano
test: use $_z40 from test
-
l
i
b
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-21
Michael J Gruber
date: av
o
id "X years
,
12 m
o
nths" in relativ
e
d
ates
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Junio
C
Hamano
Git 1
.
7
.
5
-
rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Hamano
Sy
n
c wit
h
1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Hamano
G
it 1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Mich
a
el J
G
rube
r
git-sv
n
.
txt: Document -
-
mergeinfo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-18
Junio
C
Hamano
Reve
r
t "r
u
n-command: prettify -D_FORT
I
FY_SO
U
RCE workaround"
commit
|
commitdiff
|
tree
2011-04-14
J
u
nio C Ha
m
a
n
o
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2011-04-14
René Scharfe
arch
i
ve: d
o
cument
l
imitation of tar
.
u
m
ask co
n
fi
g
setting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
M
i
chael J Gruber
t
3
3
06,t5304: avoid clock skew iss
u
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
Micha
e
l
J
Gruber
git
.
txt:
f
i
x lis
t
continuation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
G
i
t 1
.
7
.
5
-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Jun
i
o C Hamano
M
erge branch
'maint'
commit
|
commitdiff
|
tree
2011-04-13
Junio C
H
amano
Merge branch 'jc/rev-lis
t
-o
p
tions-fix' into maint
commit
|
commitdiff
|
tree
2011-04-13
Jun
i
o C
H
amano
Merge bra
n
ch 'js
/
c
h
eckout
-
untrack
e
d-sym
l
ink' into maint
commit
|
commitdiff
|
tree
2011-04-13
Jim
M
eyeri
n
g
remove doubled 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
Ram
k
um
a
r Ramachandra
revert: Hide '-r
'
o
p
tion i
n
d
efaul
t
u
sage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
J
ohan Her
l
and
--dirst
a
t: In
case of renames, use targ
e
t
filen
a
me
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Junio C Hama
n
o
Merg
e
branch
'js/checkout-u
n
tracked-sym
l
in
k
'
commit
|
commitdiff
|
tree
2011-04-12
Jun
i
o C Hamano
Merge bra
n
ch 'nd/init-gitdir'
commit
|
commitdiff
|
tree
2011-04-12
Jo
h
annes Sixt
t2021: mark
a
test as fix
e
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Joha
n
nes Sixt
t0001: guard a
n
ew test
w
it
h
SYMLINKS prerequisite
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
J
o
han Herland
Teach --dirstat not to co
m
p
l
et
e
ly ignore rearranged
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Ævar
A
rnfjörð Bjarmason
Makefile: extr
a
ct
Q
_() source str
i
ngs as n
g
ett
e
xt()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Ramsay Jones
i18n
:
avoid parenthesized
s
tring
a
s array initializer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herl
a
nd
--dirstat-by-file: Make it faster and more c
o
r
r
e
ct
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herl
a
nd
--dirstat: Describe n
o
n-obvious differences re
l
a
t
ive
.
.
.
Improved-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Junio C Hama
n
o
Merge
git://git
.
bogomips
.
o
rg/
g
it-svn
commit
|
commitdiff
|
tree
2011-04-11
J
u
nio C H
a
mano
Merge git://g
i
t
.
ker
n
e
l
.
org/pub/scm/git
k
/gitk
commit
|
commitdiff
|
tree
2011-04-07
Dan McGee
sta
s
h
:
e
nsure --
n
o-keep-index and --
p
atch
c
an be
u
se
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-07
D
an
McGee
stash: add two more
tests for -
-
no-keep-index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-07
Andrew Garber
git-p4: replace each tab w
i
th 8 sp
a
ces
f
or c
o
n
s
istency
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
u
p
load-pack: start p
a
ck-obje
c
ts before a
s
y
nc
r
e
v-list
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Junio C
H
amano
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
Sync with 1
.
7
.
4
.
4
commit
|
commitdiff
|
tree
2011-04-06
Junio
C
H
a
mano
Git 1
.
7
.
4
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Junio C H
a
mano
Merge branch
'nm/maint
-
confli
c
t
ed-s
u
bmo
d
ul
e
-
e
ntries
.
.
.
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Merge
branch 'mg
/
rev-list-n
-
rever
s
e-doc' into ma
i
nt
commit
|
commitdiff
|
tree
2011-04-06
Juni
o
C
Hamano
M
e
r
g
e branch 'jk/maint-remote-mirror-safer'
commit
|
commitdiff
|
tree
2011-04-06
Junio
C
H
amano
Merge branch
'
m
g/doc-revi
s
ions-txt'
commit
|
commitdiff
|
tree
2011-04-06
J
eff King
stash: drop dirty workt
r
ee
check on
apply
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
T
each core
.
b
igfilet
h
r
e
a
shol
d
to pack-objects
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Jon
S
ey
m
our
stash:
f
ix fa
l
se positive
in t
h
e invalid ref test
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Je
f
f
K
ing
stash:
f
ix accidental appl
y
o
f non-exi
s
t
ent stashes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-04
Micha
e
l
J G
r
uber
revisions
.
txt
:
langua
g
e improvem
e
nts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-04
Junio
C
H
a
m
ano
Merge bran
c
h 'mai
n
t'
commit
|
commitdiff
|
tree
2011-04-04
Jun
i
o C Hamano
M
e
rge bran
c
h
'jl/
s
ub
m
odule-fetch-
o
n-dem
a
nd'
commit
|
commitdiff
|
tree
2011-04-04
Junio C H
a
mano
Merg
e
branch 'jc/rev-list
-
options-fi
x
'
commit
|
commitdiff
|
tree
2011-04-04
S
Z
EDER G
á
b
o
r
Document
a
tion:
t
rivial gramm
a
r fix in core
.
worktree
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-04
Jakub
Nare
b
ski
g
i
t
w
eb: Fix parsing o
f
negative f
r
actio
n
al t
i
mezones
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-04
Junio C Hamano
Me
r
ge bra
n
ch
'
n
m/
m
aint-conflicted-submodule-
e
ntries'
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
Merge branch
'
maint'
commit
|
commitdiff
|
tree
2011-04-03
Ju
n
io C Hama
n
o
Start
p
reparing for
1
.
7
.
4
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-03
J
e
ff
K
i
n
g
pull: do not c
l
obber untracked files on initial p
u
ll
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-03
Junio
C Haman
o
Merge branch 'jc/index-update-
i
f-able' into maint
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
Mer
g
e branch 'lt/
d
ef
a
ult-abbrev' into maint
commit
|
commitdiff
|
tree
2011-04-03
Junio
C
Hamano
Merge
bran
c
h 'jc/maint-rev-list-cul
l
ed-boundary' into
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
J
uni
o
C Ha
m
a
no
Merge bra
n
c
h 'mm
/
ma
i
nt-log
-
n-wi
t
h-diff-filtering'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
J
unio C H
a
mano
Mer
g
e
branch 'jk/format-patch-mu
l
tiline-head
e
r
'
into
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Junio C Ham
a
no
M
erge b
r
anch 'jn/m
a
in
t
-instaweb-plack-fix' into
maint
commit
|
commitdiff
|
tree
next