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 'gr/cvsimport-alternative-cvspass-location' into maint
2011-05-13
Junio C Hamano
Merg
e
branc
h
'gr/cv
s
imp
o
rt-alterna
t
ive-cv
s
p
a
ss
-
location
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C
Hamano
Merge
b
ranch 'cj/p4
m
erge'
in
t
o maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C
Ha
m
ano
Merge branch
'
jk/merg
e
-on
e
-file
-
workin
g
-tree' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C Hamano
M
erge branch 'jc/fix-diff-files-unmerged' into
maint
commit
|
commitdiff
|
tree
2011-05-13
J
u
n
io C H
a
mano
Merge bran
c
h 'mz/maint-r
e
n
a
me-unmerged' into
m
aint
commit
|
commitdiff
|
tree
2011-05-13
Johan Her
l
and
t5400: Fix a couple of
t
y
pos
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
João
B
r
itto
Remove duplicated "
i
s a
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Juni
o
C Hamano
t3701: fix
h
ere d
o
c
u
ment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Mi
c
hael J G
r
uber
git-fast-imp
o
r
t
.
txt: --relat
i
ve-marks
t
akes
n
o pa
r
ameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Dima Shar
o
v
sh
e
ll: add
m
i
s
s
i
ng
i
nit
i
alization of argv0_pa
t
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C Hamano
Git 1
.
7
.
5
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ha
m
ano
Merg
e
branc
h
'
jh/dirstat' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hama
n
o
M
e
rge branch 'sp/ma
i
n
t-clear
-
postfields
'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch
'jk/
m
a
int-stash-oob' int
o
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge bra
n
ch 'jk/maint-upload
-
pack-shal
l
ow'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C Hamano
Merge b
r
anch 'dm/sta
s
h-k-i-p'
i
n
to maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge bran
c
h 'j
c
/
pack-objects-b
i
gfile
'
i
n
to m
a
int
commit
|
commitdiff
|
tree
2011-05-04
J
unio C Hamano
Merge br
a
nch 'mg/r
e
flog-with-op
t
ions'
into
maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
n
i
o
C
Hamano
Me
r
ge branc
h
'jk/sta
s
h-loosen-safety' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch 'ar/clean-rmdir-empty' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
mano
Merg
e
b
ranc
h
'mg/sha1
-
path-advise' into maint
commit
|
commitdiff
|
tree
2011-05-04
Valentin Haenel
git-add
.
txt
:
docu
m
ent '
a
dd
.
ignoreError
s
'
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 empty
f
i
l
e
t
o
p
4me
r
ge where no base is su
i
table
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Guy Rouillier
Lo
o
k
for password in
both CVS and CVSNT
passwor
d
files
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
m
e
rge
-
one-file: fix
b
ro
k
en
merges w
i
th alternate work
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
add tests for m
e
r
g
e-index /
m
erge-o
n
e-fi
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Juni
o
C Hamano
S
tart 1
.
7
.
5
.
1 maint
e
nance track
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Ju
n
i
o
C Hamano
Merge branch 'mg/x-years-12-mont
h
s' into maint
commit
|
commitdiff
|
tree
2011-04-29
Sylvain Rabot
gi
t
-
send-email: fix missing space in
error message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Junio C Hamano
http: cle
a
r PO
S
TFI
E
L
D
S when initializin
g
a slot
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
J
u
nio C
H
amano
Git 1
.
7
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio
C Hama
n
o
diff-files: show unmerge
d
entri
e
s correctly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
J
un
i
o
C
Hamano
diff: remove o
f
ten u
n
used
p
arame
t
e
r
s from diff_unmerge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Juni
o
C Hamano
d
i
ff
.
c: return
f
ile
p
air fro
m
dif
f
_unmerge(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio
C
Hamano
test: use $_z4
0
from test
-
lib
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-21
Mich
a
el J Gruber
date:
a
void "X year
s
, 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 Hamano
Git 1
.
7
.
5-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Jun
i
o C Hama
n
o
Sync with 1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Ju
n
i
o
C H
a
mano
Git 1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Mi
c
hael J
G
ruber
g
i
t-svn
.
t
x
t: Document --mergein
f
o
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-18
J
u
nio C Hamano
Rev
e
rt "
r
un-co
m
ma
n
d: prettify -D_FORTIFY_SOURCE workaro
u
nd"
commit
|
commitdiff
|
tree
2011-04-14
Junio C Haman
o
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2011-04-14
René
Sch
a
rfe
archive: document
l
imitat
i
on of t
a
r
.
umask config setting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
Micha
e
l J G
r
uber
t33
0
6,t5304:
avoid clock skew
issues
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
M
ich
a
el J Gruber
g
i
t
.
t
x
t
:
fix list
c
ontinu
a
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
J
u
n
i
o C
H
a
mano
Git 1
.
7
.
5-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
J
u
n
i
o C
H
amano
M
erg
e
branch 'maint'
commit
|
commitdiff
|
tree
2011-04-13
Jun
i
o C
H
amano
Merge
branch
'jc
/
rev-l
i
st-option
s
-fix' into maint
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
Merge branch 'js/checkout-untrack
e
d-symlink' into
m
aint
commit
|
commitdiff
|
tree
2011-04-13
J
i
m Meyering
remo
v
e doubl
e
d
word
s
,
e
.
g
.
, s/to to/to/, a
n
d fix related
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Ramkumar R
a
mac
h
a
nd
r
a
rever
t
: Hide '-r'
o
ption in de
f
ault usage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Joha
n
Herland
--
d
irstat: In ca
s
e
of
renames,
u
se target filename
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Junio C Hamano
Merge branch 'js
/
c
h
eckout-untracked-symli
n
k'
commit
|
commitdiff
|
tree
2011-04-12
Junio C Haman
o
Merge branch 'nd/i
n
it-gitdir'
commit
|
commitdiff
|
tree
2011-04-12
J
ohannes
Sixt
t2021:
ma
r
k a test as f
i
x
ed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Johannes
Sixt
t0001: gua
r
d a new
test with SY
M
LINKS pre
r
equisite
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Johan H
e
rla
n
d
Teach -
-
dirstat not to com
p
le
t
e
ly
ignore rearran
g
ed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Ævar A
r
nfjö
r
ð Bjarmason
Makefile:
e
x
t
ract Q_() source
s
tr
i
ngs as ng
e
ttext()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
R
amsay Jones
i18n: avoid
p
arenthe
s
ized stri
n
g a
s
array init
i
alizer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--
d
irst
a
t-by-
f
ile: Make i
t
faster and more
c
o
r
r
ect
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herlan
d
--
d
irstat: D
e
scribe non-obvious diff
e
r
enc
e
s relative
.
.
.
Improved-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Juni
o
C H
a
m
a
no
Merge git://git
.
b
o
gomips
.
o
r
g
/
git
-
svn
commit
|
commitdiff
|
tree
2011-04-11
Junio C H
a
mano
Merge git://
g
it
.
ker
n
e
l
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2011-04-07
Da
n
M
cGee
stash: ensure --no-ke
e
p-index an
d
--patch can be used
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-07
Dan McGee
sta
s
h
: add two m
o
r
e
tests for --no-keep-index
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-07
A
n
drew
G
a
rber
git-p4: repl
a
ce ea
c
h tab w
i
t
h
8 spaces
for consist
e
nc
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Jeff
K
i
n
g
upload-pack: start pack
-
obj
e
cts before a
s
ync
r
e
v-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
Ju
n
io C Ha
m
ano
S
ync 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
Haman
o
Merge branch '
n
m/maint-conflicted-submo
d
ule-ent
r
ie
s
.
.
.
commit
|
commitdiff
|
tree
2011-04-06
Junio
C
Hamano
Merge branch
'
mg/rev-list-n-
r
everse-doc' i
n
to m
a
i
n
t
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Merge
b
ranch 'jk/maint-remote-mirror-saf
e
r'
commit
|
commitdiff
|
tree
2011-04-06
Juni
o
C Hama
n
o
M
e
rge
branch 'm
g
/doc-revisio
n
s
-
tx
t
'
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
stash:
d
rop dirt
y
wo
r
ktree
c
heck o
n
apply
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Teach c
o
r
e
.
b
i
g
filethreashold to p
a
ck-obje
c
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Jon Se
y
mo
u
r
s
tash: fix false positive in t
h
e in
v
a
l
id ref test
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Jef
f
Ki
n
g
stash:
fi
x
accidental apply of non-existent stashes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-04
Michael J Grube
r
r
e
vi
s
ions
.
t
x
t:
languag
e
i
m
provements
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-04
Junio C
H
am
a
no
Merge branch 'mai
n
t
'
commit
|
commitdiff
|
tree
2011-04-04
Junio
C
Hama
n
o
M
e
r
ge branch 'jl/sub
m
odule-fetch-on-de
m
and'
commit
|
commitdiff
|
tree
2011-04-04
Juni
o
C
Hamano
M
erge b
r
a
nch
'
jc/r
e
v
-
list-options-fix'
commit
|
commitdiff
|
tree
2011-04-04
S
ZE
D
E
R
Gábor
Documentat
i
on:
t
rivial grammar f
i
x
i
n
c
ore
.
workt
r
ee
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-04
J
a
kub
N
a
rebski
gitweb: Fix parsing o
f
n
e
g
a
tive fractional t
i
mezones
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-04
Junio C Hama
n
o
Me
r
ge branch 'nm/
m
aint-
c
onfl
i
cted-
s
ubmodule
-
entries'
commit
|
commitdiff
|
tree
2011-04-03
Junio
C
Hamano
Me
r
g
e
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2011-04-03
Jun
i
o
C Hamano
Sta
r
t prepa
r
ing fo
r
1
.
7
.
4
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-03
J
e
ff King
pull: do
n
ot clobber untracked files
on initial p
u
ll
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
M
erge branch 'jc/i
n
dex-update-if-able' into main
t
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
Me
r
ge branch 'lt/default-abbr
e
v
'
into main
t
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
Merge branch 'jc
/
mai
n
t-rev-l
i
s
t-c
u
l
led-boundary' int
o
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Junio C
Hama
n
o
Merge branc
h
'mm/
m
aint-log-n-wit
h
-diff-filtering' into
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Junio C Haman
o
Merg
e
bran
c
h 'jk/for
m
a
t
-patch-
m
ultiline-hea
d
er' into
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Junio C H
a
mano
Merge branch 'jn/m
a
i
n
t-instaweb-plack-fix' int
o
maint
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
Merge bran
c
h 'lp/config-vername-check
'
into maint
commit
|
commitdiff
|
tree
2011-04-03
M
ichael J
G
ru
b
er
sha
1
_name
:
Suggest commit
:
.
/file for path i
n
su
b
dir
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-03
M
i
chael J Grube
r
t
1506
:
factor out test for
"Did
y
ou me
a
n
.
.
.
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-03
Jonat
h
an Nieder
compat:
add missing #inclu
d
e <sys/resou
r
ce
.
h>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-03
L
awrence Mitchell
git
.
el
:
Don't use font-lock-co
m
p
ile-keywords
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-03
Ævar
A
rn
f
j
ö
rð Bjar
m
ason
t2019-checkout-ambiguous-ref
.
sh: depend on C_L
O
CALE_OUTPUT
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next