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
Merge branch 'vh/git-svn-doc' into maint
2011-05-15
Junio
C
Ham
a
no
Merge branch 'vh/git-svn-d
o
c
' int
o
maint
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
H
a
mano
git_open_noatime(): d
r
op unused parameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
sha1_file
:
typ
o
f
ix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Jonathan Nieder
add, me
r
ge, diff: do not us
e
st
r
casec
m
p
t
o comp
a
r
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Hamano
Pr
e
pa
r
e for 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
i
o
C
Hamano
Merge branch 'aw/maint-
r
e
b
a
s
e-i-p-n
o
-ff' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C
Hamano
Merge branch 'js/bl
a
me-parsename' into maint
commit
|
commitdiff
|
tree
2011-05-13
J
unio C
Hamano
Merge branch '
g
r/c
v
s
im
p
o
r
t-alter
n
ative-cvspass-location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'c
j
/
p
4merg
e
' int
o
maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ha
m
an
o
Merge branch 'jk/merge-one
-
file-
w
orki
n
g-tree' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
amano
Merge bran
c
h 'jc/fix-dif
f
-files-un
m
e
r
g
e
d
'
in
t
o
maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C
Hamano
M
e
rge branch
'
mz/maint-rename-unmerged' into
m
aint
commit
|
commitdiff
|
tree
2011-05-13
Johan Herland
t5400: F
i
x a couple
o
f typos
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
João
Britto
Remove dupl
i
cated "is a"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Ham
a
no
t
3701: fix here
d
ocument
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Mic
h
ael
J
Gruber
git-fast-import
.
txt: --rel
a
t
iv
e
-ma
r
ks takes no para
m
ete
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
D
ima Sharov
shell: add missing in
i
tia
l
iza
t
i
o
n of argv0_path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Br
i
an G
e
rnhar
d
t
t
/a
n
no
t
ate-tests: Use echo & cat inste
a
d of sed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Git 1
.
7
.
5
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hama
n
o
M
e
rge branch 'jh/dir
s
tat' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
M
e
r
g
e bra
n
ch 'sp/main
t
-
c
lear-postfield
s
' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Haman
o
Merge branch 'jk/maint
-
stash-oob' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C
Hamano
Merge branch
'
jk/ma
i
n
t
-
upl
o
a
d
-pack-shallow' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch 'dm/
s
tash-
k
-i-
p
' into
m
aint
commit
|
commitdiff
|
tree
2011-05-04
J
unio
C
Hamano
Merge branch 'jc/pack-objec
t
s-bigfi
l
e
'
i
n
to maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Hamano
Merg
e
branch 'mg/reflo
g
-with-options' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merg
e
branch 'jk/stash-
l
oosen-safety'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C Hamano
Merge b
r
anch '
a
r/cle
a
n
-rmdir-empty' into m
a
int
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
mano
Mer
g
e branch 'mg/sh
a
1-path
-
advise'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Val
e
ntin Haenel
git-add
.
txt: docum
e
n
t
'
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
Ci
a
ran Jessu
p
P
ass empty file to p4merge where no base is suitable
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Gu
y
Rouil
l
ier
Look
for passwor
d
in both C
V
S and CVSNT pa
s
s
w
ord f
i
les
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jeff K
i
ng
merge-one-f
i
le: fix
broken
m
erge
s
with al
t
ernate
w
ork
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jeff K
i
ng
add t
e
s
ts for
merge-index
/
m
e
rge-one-file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
Sta
r
t 1
.
7
.
5
.
1 maintenance tr
a
ck
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
u
nio C Hamano
Me
r
ge b
r
anch
'
mg/x-yea
r
s-
1
2-months' into maint
commit
|
commitdiff
|
tree
2011-04-29
Sylvain Ra
b
ot
git-send-email: fix missing space in e
r
ro
r
m
essage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Josh St
o
ne
bl
a
me: toler
a
te
b
ogus e-m
a
il
addresses a bit bet
t
er
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-28
And
r
ew Wong
git-rebase--
i
nteractive
.
s
h
: p
r
eserv
e
-merges fails on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Valen
t
in Haenel
git-svn
.
txt: small typeface im
p
rov
e
ments
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Valenti
n
Haene
l
git-svn
.
txt: move option d
e
scriptions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Valen
t
in
H
a
e
nel
g
i
t-svn
.
txt:
f
i
x
usage of
-
-a
d
d-author-from
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Junio C H
a
m
ano
http: clear POSTFIELDS
when initializin
g
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
u
nio C Hamano
diff-f
i
les: s
h
o
w unmerged ent
r
ies cor
r
ectly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
diff: remove often unused parameter
s
fro
m
diff_unmerg
e
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio
C
Haman
o
diff
.
c: return filepai
r
from
d
iff_u
n
merge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Ha
m
ano
test: use $_z40
from tes
t
-l
i
b
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-21
Michael
J Gr
u
ber
d
ate: avoid
"
X years
,
12
months"
i
n relati
v
e dates
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Hama
n
o
Git 1
.
7
.
5-r
c
3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Junio C
H
amano
Sync with
1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
J
u
ni
o
C
Hama
n
o
G
i
t 1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Michael J Gruber
git-sv
n
.
txt: Document
--mergeinfo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-18
Jun
i
o
C
Hamano
R
e
v
e
rt "run-command:
p
retti
f
y
-D_FORTIFY_SOURCE
workaround"
commit
|
commitdiff
|
tree
2011-04-14
Junio C Haman
o
Merge br
a
nch 'main
t
'
commit
|
commitdiff
|
tree
2011-04-14
René Sch
a
rfe
a
r
chive
:
documen
t
limit
a
tion
o
f
ta
r
.
umask config setting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
Mi
c
h
a
el
J Gruber
t3306,t5
3
0
4: avoid
c
lock skew iss
u
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
Mic
h
ael J
G
ruber
g
i
t
.
txt: fix list conti
n
uation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
J
unio C
H
a
m
a
no
Git 1
.
7
.
5-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Jun
i
o C Ha
m
ano
Merge branch
'maint'
commit
|
commitdiff
|
tree
2011-04-13
J
unio C Hamano
Merge branch 'jc
/
rev
-
l
i
st-
o
ptions-fix'
into maint
commit
|
commitdiff
|
tree
2011-04-13
Junio C Haman
o
Merge
b
r
anch 'j
s
/checkout-untracked-symli
n
k
'
int
o
maint
commit
|
commitdiff
|
tree
2011-04-13
J
i
m Meyerin
g
remo
v
e dou
b
led wo
r
ds, e
.
g
.
,
s
/to
to/to/
,
and fix r
e
la
t
e
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
R
amkumar
R
amachandra
revert: Hide '-r'
o
pt
i
on in default usage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Joh
a
n Herland
--
d
irstat: In case o
f
r
enames,
use
t
a
r
g
e
t
filen
a
me
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Juni
o
C Hamano
Merg
e
b
r
anch 'js
/
c
heckout-untrack
e
d-symlink
'
commit
|
commitdiff
|
tree
2011-04-12
J
unio C Hamano
M
e
rge bran
c
h 'n
d
/init-g
i
t
dir'
commit
|
commitdiff
|
tree
2011-04-12
J
ohannes S
i
xt
t2
0
2
1
: mark a test a
s
fi
x
e
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Johannes Sixt
t00
0
1: g
u
ard a new test wi
t
h S
Y
MLIN
K
S pre
r
equisite
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
J
o
han Herland
T
e
ach --dirst
a
t
n
ot to comp
l
etely ign
o
re rear
r
anged
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Ævar Arnfjörð
Bjarmason
Ma
k
e
f
ile:
e
xt
r
act Q_() sourc
e
str
i
n
g
s as ng
e
ttext()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Ramsay Jones
i18n: avoid parenthesized stri
n
g
as array initia
l
i
z
er
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dirstat-by-fi
l
e: Make it
f
aster and
m
ore cor
r
ect
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Her
l
and
--dirstat: Describe n
o
n-obvious differences relative
.
.
.
Improved-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Jun
i
o C Hamano
Merge git://git
.
bo
g
om
i
ps
.
org/
g
it-svn
commit
|
commitdiff
|
tree
2011-04-11
Junio C Hama
n
o
Merge
g
it://git
.
ker
n
el
.
or
g
/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2011-04-07
Dan Mc
G
ee
stas
h
: ensure -
-
n
o
-keep
-
in
d
e
x
and -
-
patch
c
an be used
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-07
Dan M
c
G
ee
stash
:
add
two more tests for
-
-n
o
-keep-in
d
e
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-07
Andrew Garber
git-p4: r
e
p
l
ac
e
each ta
b
with
8
spaces f
o
r consis
t
e
ncy
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Jeff K
i
ng
up
l
o
ad-pack: start pack-
o
bjects before
async rev-list
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Git 1
.
7
.
5
-
rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Juni
o
C Hamano
Sync 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
Junio
C
Ham
a
no
Merge branch
'nm/
m
aint-conflicte
d
-submodule-e
n
tries
.
.
.
commit
|
commitdiff
|
tree
2011-04-06
Jun
i
o C Hamano
Me
r
ge branch 'm
g
/rev-l
i
st-n-r
e
verse-doc' into
m
aint
commit
|
commitdiff
|
tree
2011-04-06
Junio C Ham
a
no
Merge
branch
'
jk/maint-re
m
o
t
e-mirror-safer'
commit
|
commitdiff
|
tree
2011-04-06
Juni
o
C Hamano
Merge
b
ranch '
m
g/
d
oc-revisions-txt'
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
st
a
s
h: drop dirty work
t
r
e
e
chec
k
on apply
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Juni
o
C Hamano
Teach
c
ore
.
bigfilethreas
h
old to
pack-objects
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Jo
n
Seymour
stash: fi
x
false
positive in the invalid ref
test
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Je
f
f K
i
ng
stash:
f
i
x accidental apply of
n
on-exi
s
t
ent
s
ta
s
hes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-04
Micha
e
l
J
Gruber
revisions
.
txt: l
a
nguage improve
m
ents
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-04
Ju
n
io
C
Hamano
Merge branch 'm
a
int'
commit
|
commitdiff
|
tree
2011-04-04
Junio C Hamano
Merge branch
'
jl
/
submodule-f
e
tch-
o
n-
d
eman
d
'
commit
|
commitdiff
|
tree
2011-04-04
Junio
C
Haman
o
Merge branch 'j
c
/rev-list-options-fix'
commit
|
commitdiff
|
tree
2011-04-04
S
Z
E
DER G
á
bor
Documen
t
ation:
t
rivial grammar fix in core
.
worktree
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-04
Jakub N
a
r
e
bski
gitweb: F
i
x parsin
g
of n
e
g
ati
v
e fractional
t
i
m
ezones
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-04
J
u
nio C Hamano
Me
r
ge branc
h
'nm/ma
i
nt-conflicted-submodule-entrie
s
'
commit
|
commitdiff
|
tree
2011-04-03
Junio C
H
a
mano
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
Start preparing for 1
.
7
.
4
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next