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 'sr/maint-fast-import-tighten-option-parsing' into maint
2011-05-16
Junio C Hamano
Merge
branch 'sr/maint-
f
ast-imp
o
rt-tighten-
o
ption-parsin
g
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Mer
g
e branch 'jc/t150
6
-shell-param-expansio
n
-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Junio C Ham
a
no
M
e
r
g
e bran
c
h 'j
c
/fix-add-u-unmer
g
ed' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-16
J
uni
o
C Hamano
Merge bran
c
h
'jn/gitwe
b
-depende
n
cy' into m
a
int
commit
|
commitdiff
|
tree
2011-05-16
Junio
C Hamano
M
erge branch 'jc/maint-bran
c
h-mergeoptions' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
amano
Merge bra
n
ch 'jc/
m
ai
n
t-add-p-overlapping
-
hunks
'
into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Jim Meyering
Documentation/git-fs
c
k
.
tx
t
: fix
typo: unreadable -
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C
Hamano
Upd
a
te draft relea
s
e notes
t
o
1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merg
e
bra
n
ch
'
cn/form
a
t-patch-quie
t
' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
Merg
e
branch 'jm/mergetool-submod
u
les' into main
t
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
M
erge b
r
a
n
c
h
'jk/form
a
t-patch-quote-spe
c
i
a
l-in-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
Hamano
Merg
e
branch
'vh/git-sv
n
-d
o
c' into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C
Hamano
git_open_
n
oatime(): drop unused p
a
ra
m
et
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Junio C Hamano
s
ha
1
_fil
e
:
t
ypof
i
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-15
Jonathan Ni
e
der
add, merge, d
i
ff: do not use strcase
c
mp to c
o
mpare
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Prep
a
re for 1
.
7
.
5
.
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
amano
Merge
branch 'aw/m
a
int-rebase-i-
p
-no-f
f
' into maint
commit
|
commitdiff
|
tree
2011-05-13
J
unio C Ha
m
ano
Merg
e
branch 'js/blame-parsename' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
M
erge br
a
nch 'gr/cvs
i
mport-al
t
ernativ
e
-cvs
p
ass-location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge b
r
a
nch '
c
j
/p4m
e
rge' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge b
r
anch 'jk/merge-o
n
e-file-working
-
tree' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C
Hamano
M
erge branch 'jc/fix-di
f
f-files-unmerged
'
i
nt
o
maint
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Hamano
M
e
rge br
a
nch 'mz/maint-rename-unme
r
ged' into maint
commit
|
commitdiff
|
tree
2011-05-13
Johan Herland
t
5400: Fix a couple of typos
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
J
u
nio
C
Hamano
t1507: avoid "${parameter<op>'word'}" insid
e
double
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Junio C Ha
m
ano
t3701:
add-p-fix makes
the last test t
o
pass
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Ja
k
ub Narebski
Remove git
w
eb/
g
itweb
.
cgi
a
nd other legacy targets from
.
.
.
Requested-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Jaku
b
Na
r
ebski
g
it-instawe
b
:
S
impl
i
fy build
d
ep
e
nd
e
ncy on git
w
eb
Reported-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Junio C Haman
o
m
erge: make br
a
n
c
h
.
<name
>
.
mer
g
e
o
ption
s
correc
t
ly overrid
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Jo
ã
o Britto
Remove duplic
a
ted "is
a
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Sve
r
re Ra
b
belier
fast-import
:
fix opti
o
n parser for no-arg option
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Hamano
t3701: fix here doc
u
men
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
M
i
c
hael J Gruber
git-fa
s
t-impo
r
t
.
txt: --relati
v
e-marks
takes no parameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
D
i
ma
S
har
o
v
shell: add mi
s
sin
g
initialization of argv0_path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Brian
G
ernhardt
t/annotat
e
-tests: Use echo
& c
a
t instead of
s
ed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ha
m
ano
Git 1
.
7
.
5
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
am
a
no
M
er
g
e branch 'jh/dirstat' int
o
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Hamano
Merge b
r
anch 'sp/
m
aint-clear-postfields' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C Ham
a
no
Merge bra
n
ch
'jk/main
t
-stash-
o
ob' into
m
aint
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C Hama
n
o
Me
r
ge branch 'jk
/
maint-upload-pack-sha
l
low
'
int
o
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Me
r
ge bra
n
ch '
d
m/
s
tash-k-i-p' into maint
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C Hamano
Merge
branch 'jc/pa
c
k-
o
b
j
ects-bigfile'
i
nto
m
a
i
n
t
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C
Hamano
Me
r
ge branch 'mg/reflog-
w
ith-opti
o
n
s' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C Hamano
Merge branc
h
'jk/sta
s
h-lo
o
s
e
n-s
a
fe
t
y' into maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Hamano
Mer
g
e b
r
a
n
ch 'ar/clean
-
rmdir-empty
'
in
t
o maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge bran
c
h 'mg
/
sha1-path-a
d
vise' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Valentin Hae
n
el
git-add
.
txt: document
'
add
.
ign
o
reErr
o
r
s
'
Noticed-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
C
i
aran
J
es
s
up
Pass empty file to
p
4merge where n
o
base
i
s suitable
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Guy Rouillier
Loo
k
for passwor
d
in b
o
th CVS and CVSN
T
password file
s
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jeff Ki
n
g
merge
-
one-fil
e
: fix broken merges
w
i
t
h a
l
ternate work
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
e
ff King
add tests for merge-index / merge-one-file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jun
i
o
C
Hamano
"
a
d
d
-p": work-ar
o
und
an o
l
d laziness th
a
t does not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
a
dd--in
t
erac
t
ive
.
per
l
:
f
a
c
tor out re
p
eated --
r
ecoun
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Ju
n
io C
H
amano
t
3701: E
d
iting
a spl
i
t
h
unk i
n
an "add -p" s
e
ssi
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Ju
n
io C Hama
n
o
ad
d
-p: 'q' should rea
l
ly
q
u
it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C
H
ama
n
o
Start 1
.
7
.
5
.
1 maintenance track
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jun
i
o
C Hamano
Merge bran
c
h
'mg/x
-
y
ears
-
12-mont
h
s
'
into maint
commit
|
commitdiff
|
tree
2011-04-29
Sylvain Rabot
git-send-email: fix miss
i
ng space in error message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Josh St
o
ne
blam
e
:
tolerate bogu
s
e-mail add
r
esses a bit better
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-28
Andrew Wong
git-r
e
base--interactive
.
sh:
preserve-m
e
rg
e
s f
a
ils on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Jeff King
p
re
t
t
y:
q
uote rfc822
specials in email addresses
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Valentin Haenel
git-svn
.
t
xt: small typeface imp
r
oveme
n
ts
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Valentin Haenel
git-svn
.
txt: mov
e
o
p
t
i
o
n de
s
c
rip
t
ions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Val
e
n
tin Haenel
git-s
v
n
.
txt: fix us
a
ge of --add-author-fro
m
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Junio C
H
ama
n
o
h
t
t
p:
c
lear POSTF
I
ELDS when initializing
a slot
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C
Ha
m
ano
Git 1
.
7
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
J
unio
C Hamano
F
ix
"
add -u" th
a
t sometim
e
s
fails
to reso
l
ve
unmerge
d
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
di
f
f-f
i
l
e
s: show unmerged entries correctly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Ju
n
io C Hama
n
o
diff: r
e
move
o
f
t
en unused parameters from dif
f
_unmerge
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio
C H
a
mano
d
iff
.
c:
r
eturn
f
ilepair from
diff
_
u
nmerge(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
J
unio C Ha
m
ano
test: use $_
z
40 from te
s
t-lib
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-21
Michael
J
G
r
uber
da
t
e
:
avoid "X yea
r
s,
12 months" in relative date
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
J
unio C Hamano
Git 1
.
7
.
5-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
J
uni
o
C
Hamano
Sync wit
h
1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Jun
i
o
C
Hamano
Git 1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Mich
a
e
l J Gruber
git-
s
vn
.
txt
:
D
ocument
-
-mergeinfo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-18
Junio C
H
amano
R
e
vert "run-com
m
and: pret
t
ify -D_FORTIFY_SOURCE w
o
rk
a
r
o
und"
commit
|
commitdiff
|
tree
2011-04-14
Junio C
H
amano
Merge b
r
an
c
h
'maint'
commit
|
commitdiff
|
tree
2011-04-14
René Scharfe
archive: docume
n
t limitation of
t
a
r
.
umask
c
onfig setting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
Michael J
G
r
u
ber
t33
0
6,t5304: av
o
i
d
c
l
o
c
k
skew issues
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
Michael J Grub
e
r
git
.
txt:
fix list contin
u
ation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Junio C Ha
m
a
no
G
i
t 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 'maint'
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
Merge bra
n
ch 'jc/rev-list-option
s
-fix' into maint
commit
|
commitdiff
|
tree
2011-04-13
J
u
nio
C
Ham
a
no
Merge
b
ranch 'js/ch
e
c
kout
-
u
n
tracked-symlink
'
i
n
to
maint
commit
|
commitdiff
|
tree
2011-04-13
Jon
a
thon Ma
h
mergetool: Te
a
ch a
b
o
u
t submodules
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
J
i
m Meyeri
n
g
remove doubled w
o
rds, e
.
g
.
, s/to to/to/, a
n
d fix rel
a
t
ed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Ramkumar Ramach
a
ndra
rev
e
r
t
: Hi
d
e '-r
'
option
in defaul
t
us
a
ge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Carlos Mar
t
ín Nieto
format-pat
c
h: document --q
u
iet
o
pt
i
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Carlos
Martín Nieto
forma
t
-patch: don't pass o
n
the --qui
e
t flag
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herland
--dirstat: I
n
case of rename
s
, use
t
arget
f
ile
n
ame
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Jun
i
o
C
Haman
o
Merge branch 'js/
c
heckout-untra
c
ked-symlink'
commit
|
commitdiff
|
tree
2011-04-12
Junio C
Ham
a
no
Merge br
a
nch 'nd/init-gitdir'
commit
|
commitdiff
|
tree
2011-04-12
Johanne
s
Six
t
t2
0
21: ma
r
k
a test as fixed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
J
ohannes
Sixt
t
0001:
g
uard a
ne
w
test
w
ith
SYMLINK
S
prerequisite
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Joh
a
n Herlan
d
Teach -
-
d
i
rst
a
t
not to completely i
g
n
o
re
r
earr
a
nged
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Ævar
Arnfj
ö
rð
Bjarmason
Makef
i
le
:
extract Q_
(
) so
u
rce strings as
n
gettex
t
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Ramsay
J
o
nes
i18n: avoid parenth
e
sized strin
g
as array initializer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
-
-di
r
s
tat-by-f
i
le: Make it faster and more correct
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Jo
h
a
n
Herlan
d
--dirstat:
D
escrib
e
non
-
obv
i
ous differenc
e
s
relative
.
.
.
Improved-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next