repo.or.cz
/
git
/
jnareb-git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'jk/format-patch-quote-special-in-from' into maint
2011-05-15
Junio C Hamano
Merge branch 'jk/format-
p
atch-quote-specia
l
-in
-
fr
o
m
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio
C Hamano
Merge bran
c
h
'vh/g
i
t-svn-doc' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-15
Junio C
Hamano
git_op
e
n_noatime(): drop unused parameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
u
n
i
o
C Hamano
sha1_fi
l
e: t
y
pofi
x
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Jonathan Nieder
add, mer
g
e, dif
f
:
do
n
ot
u
se strcasecmp to
co
m
p
a
re
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
a
m
ano
Prepar
e
for 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ham
a
n
o
Merge branch 'aw/
m
ai
n
t
-r
e
base-i-p-
n
o
-ff'
i
nto
maint
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C Hamano
Merge b
r
a
n
ch 'js/blame-p
a
rsename' i
n
to maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ha
m
ano
Merge br
a
nch
'
g
r/c
v
simpo
r
t-al
t
ernative-cvs
p
ass-locati
o
n
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
J
unio C Hamano
Merge b
r
anch 'cj/p4me
r
ge'
into maint
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio
C Hama
n
o
Merge branch 'jk/mer
g
e-one-fil
e
-working-tre
e
' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C Hamano
M
erge bra
n
ch 'jc/fix-diff-
f
iles-unme
r
ged' int
o
maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ham
a
no
Merge branch 'mz/mai
n
t-re
n
a
me-unmerged
'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-13
Johan He
r
l
and
t5400:
F
i
x
a
coup
l
e of typ
o
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
João Britt
o
Remov
e
duplicated "is
a
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
J
unio C
Ha
m
ano
t370
1
: fix her
e
document
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Michae
l
J Gruber
git-fa
s
t-imp
o
r
t
.
txt: --relative-marks
t
akes no pa
r
ameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Dima Sharov
shell:
a
dd mis
s
i
ng
initialization of argv0_path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Brian Gernhardt
t/ann
o
tate-tests: Use echo & cat i
n
s
tead of sed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C Hamano
Git 1
.
7
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio C
Ham
a
no
Merge bra
n
c
h
'jh/
d
irstat' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
amano
Merge br
a
n
c
h
'sp/main
t
-clear-postfiel
d
s' into maint
commit
|
commitdiff
|
tree
2011-05-04
J
unio
C
Hamano
Merge branch 'jk/
m
a
int-stash-oo
b
' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio C H
a
mano
Merge br
a
n
c
h 'jk/mai
n
t-up
l
oad-pa
c
k-shallow' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge
b
ranch 'dm/s
t
ash-k-i-p' int
o
ma
i
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C
Hamano
Mer
g
e
b
ranch 'jc/pack-objects-bigfile' into maint
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C
H
a
mano
Merge bran
c
h '
m
g/reflog-
w
ith
-
options' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ham
a
no
M
er
g
e branch 'jk/stas
h
-lo
o
sen-safety' i
n
to
m
a
int
commit
|
commitdiff
|
tree
2011-05-04
J
unio C Hamano
Merge branch '
a
r/clean-rmdir-empty' int
o
m
a
int
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C Haman
o
Merge b
r
anch 'mg/sha1-p
a
th-advis
e
' into
m
a
int
commit
|
commitdiff
|
tree
2011-05-04
Valentin
H
aenel
git-add
.
tx
t
:
d
o
cument
'ad
d
.
ignore
E
rrors'
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 Jessup
Pass empty file to
p
4
merge
w
her
e
n
o
base is
suitable
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
G
u
y
R
o
u
i
llier
Look for pass
w
ord in both
C
VS and CVSNT password files
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
mer
g
e-on
e
-file: fix broken merges with alternate work
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
e
f
f
King
a
d
d tests for merge-in
d
ex
/
merge-one-f
i
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
Start 1
.
7
.
5
.
1 maint
e
na
n
c
e
tr
a
ck
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
u
nio C Hamano
Merge branch 'm
g
/x-years
-
1
2-months
'
into maint
commit
|
commitdiff
|
tree
2011-04-29
S
ylvain Rab
o
t
g
it-send-email: f
i
x missing space in error message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Josh Stone
blame: tolera
t
e bogus e-mail addresses a bit better
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-28
Andr
e
w Wong
git-re
b
ase--interactive
.
sh: preserve
-
merge
s
fails
o
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
J
e
ff King
pretty: quote
r
fc8
2
2 special
s
in
e
mail addre
s
se
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Val
e
n
tin Haenel
git-svn
.
txt: small typefac
e
i
mprovements
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Valentin Haenel
g
it
-
svn
.
txt:
m
o
v
e option descriptions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Valentin Ha
e
nel
git-svn
.
txt: fix usage of --
a
dd
-
a
u
thor-from
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Junio C
Ha
m
ano
h
t
tp: cl
e
a
r POSTFIELDS when initializing a slo
t
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
Junio C
H
amano
d
i
ff-files: show
u
n
m
erged ent
r
ies
c
orrectly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Ju
n
io C Hamano
diff: r
e
m
ove often
u
nused para
m
eters
from
d
iff_un
m
erge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
diff
.
c: return f
i
l
e
pair from di
f
f_unmerge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
test: u
s
e $_z40 from test
-
lib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-21
M
i
chael
J
Gruber
dat
e
: avoid "X years,
1
2
m
onths" in relati
v
e dat
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
J
u
n
i
o
C Hamano
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
ama
n
o
Syn
c
with
1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio
C Hamano
Gi
t
1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Mi
c
hae
l
J Gruber
git-svn
.
txt: Document --mergeinfo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-18
Junio C Hamano
Rev
e
rt "run-
c
ommand: p
r
ettify -D_FORTIFY_
S
OURCE wo
r
k
a
round
"
commit
|
commitdiff
|
tree
2011-04-14
Junio
C Hama
n
o
Merge
b
ranch
'
mai
n
t'
commit
|
commitdiff
|
tree
2011-04-14
René Scharfe
archive: documen
t
lim
i
tation of
tar
.
umask confi
g
setting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
M
i
c
h
ael J Gruber
t3306,t530
4
: avoid
clock ske
w
iss
u
es
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Michael J
G
ruber
git
.
txt: fix list con
t
i
n
uation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
J
u
nio
C
H
amano
Git 1
.
7
.
5-rc2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Junio
C
Hamano
Merge bra
n
ch 'ma
i
nt'
commit
|
commitdiff
|
tree
2011-04-13
Junio C H
a
man
o
M
erge
b
ranch 'jc/rev-list-optio
n
s-fix' into
m
aint
commit
|
commitdiff
|
tree
2011-04-13
Junio C Ham
a
no
Merge
b
r
a
nch 'js
/
c
heckout-
u
ntracked-symli
n
k' into maint
commit
|
commitdiff
|
tree
2011-04-13
Jim Mey
e
ri
n
g
rem
o
ve d
o
ubled words, e
.
g
.
, s/to to/
t
o/, an
d
fix related
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Ra
m
ku
m
ar Ramachandra
revert:
Hide '-r' option
i
n d
e
f
ault usage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herland
--
d
ir
s
tat: In case
of renames, us
e
targe
t
filenam
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Junio C Hamano
Merge branc
h
'js/checkou
t
-untracked-symlink'
commit
|
commitdiff
|
tree
2011-04-12
Juni
o
C Haman
o
Mer
g
e branch 'nd/
i
nit-gitdir'
commit
|
commitdiff
|
tree
2011-04-12
Johanne
s
Sixt
t
20
2
1:
mark
a test as
f
ixed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Johannes
Si
x
t
t0001:
guard a new test with
SYML
I
NKS
pre
r
eq
u
isite
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Johan He
r
la
n
d
Teach --d
i
rstat
not
t
o comple
t
ely
ignore rearranged
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Ævar Ar
n
fjörð Bjarma
s
o
n
Makefile: ex
t
ract
Q
_
() s
o
urce st
r
in
g
s as
ngettext()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Ram
s
ay
J
on
e
s
i18n: avoid parenthesized str
i
ng as array initi
a
liz
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
J
o
han Herland
-
-dir
s
tat-by-f
i
le:
M
ake it f
a
ster and
m
ore
c
orrect
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--
d
i
rst
a
t: De
s
c
r
ibe non-obvi
o
u
s differences r
e
lat
i
v
e
.
.
.
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 H
a
mano
Merg
e
git://git
.
bog
o
mips
.
org
/
gi
t
-svn
commit
|
commitdiff
|
tree
2011-04-11
Junio C Hamano
M
e
rge
g
it://
g
it
.
kern
e
l
.
org/p
u
b/
s
cm/gi
t
k/g
i
t
k
commit
|
commitdiff
|
tree
2011-04-07
Dan McGee
stash: en
s
ur
e
--no-kee
p
-ind
e
x and --patch can be
used
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-07
Dan
McGee
stash: add two m
o
re tests f
o
r --
n
o-keep-index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-07
Andrew Garber
git-p4: replace e
a
c
h
tab with 8 spaces for con
s
is
t
e
nc
y
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Jeff
K
ing
u
p
load-pack: st
a
r
t pack-object
s
bef
o
re async
r
ev
-
list
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Junio
C Ham
a
n
o
Git 1
.
7
.
5-rc1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Sync with
1
.
7
.
4
.
4
commit
|
commitdiff
|
tree
2011-04-06
Jun
i
o C Hamano
G
i
t
1
.
7
.
4
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Junio
C
H
a
man
o
Me
r
ge branch 'nm/maint-con
f
l
i
c
te
d
-submodule-entr
i
es
.
.
.
commit
|
commitdiff
|
tree
2011-04-06
J
u
n
io C Hamano
M
er
g
e
b
ran
c
h
'mg/rev-lis
t
-n-reverse-doc' into ma
i
nt
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Mer
g
e branch
'
jk/maint-remote-mi
r
r
o
r-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
stash: drop dirty
w
orktre
e
che
c
k
on apply
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Junio C
H
ama
n
o
T
e
ac
h
c
o
re
.
bi
g
filethreashold t
o
p
a
ck-
o
bj
e
cts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Jon
Seymour
stash: fix false
positive
i
n
the invalid ref test
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
J
eff King
s
tas
h
:
fix a
c
cident
a
l apply of non-exi
s
tent sta
s
hes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-04
Mi
c
h
ael J Gruber
revisions
.
txt: l
a
nguage improvemen
t
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-04
Junio C
H
amano
Merge b
r
a
nch 'maint'
commit
|
commitdiff
|
tree
2011-04-04
J
u
n
io C H
a
mano
Merg
e
br
a
nch 'jl/submodule-fetch-on-de
m
and'
commit
|
commitdiff
|
tree
2011-04-04
J
unio C
H
a
mano
Merge branch
'jc/re
v
-list-optio
n
s-fix'
commit
|
commitdiff
|
tree
2011-04-04
S
ZEDER Gábor
Documentation: trivi
a
l
g
rammar fix in core
.
worktree
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-04
Ja
k
ub Nar
e
bsk
i
git
w
eb: Fix
p
arsing of
n
e
g
ative
fractional
t
imezone
s
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-04
J
u
nio
C Ham
a
no
Merge branch 'nm/main
t
-
conflicted-s
u
bmo
d
u
le-e
n
tri
e
s'
commit
|
commitdiff
|
tree
next