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 'jk/merge-one-file-working-tree' into maint
2011-05-13
Junio C Hamano
Merge branch 'jk
/
mer
g
e-o
n
e-file
-
wo
r
ki
n
g-tree' int
o
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio
C
Hama
n
o
Merg
e
bra
n
ch 'jc/fix
-
diff-files
-
unm
e
rged' into maint
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C
H
amano
Merge b
r
a
n
ch 'mz/maint-ren
a
m
e
-unm
e
rged' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-13
Johan Herland
t54
0
0
: Fix a coup
l
e of typos
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
João
B
ritto
Rem
o
v
e
duplicat
e
d "i
s
a"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Ha
m
a
n
o
t370
1
:
f
i
x here document
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Michael J
G
ruber
gi
t
-fast-import
.
txt:
-
-r
e
l
ativ
e
-marks take
s
no p
a
ramete
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Dima Sharov
shell:
ad
d
m
i
ssin
g
i
n
itializa
t
i
on of
argv0_path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
J
unio 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
branch 'jh/dirstat'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
J
uni
o
C Ha
m
ano
Merge bra
n
ch 'sp/maint-cl
e
ar-postfiel
d
s' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
mano
Merge branc
h
'jk/
m
aint-stash-o
o
b'
into
maint
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C
H
ama
n
o
M
e
r
ge branch 'jk/
m
aint-
u
pload
-
pack
-
shallow' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Hamano
Merge branch 'dm/stash-k-i
-
p' into maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
n
io C
Hamano
Merge
br
a
nch 'jc/
p
ac
k
-ob
j
ects-bigfile'
into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch
'
m
g
/ref
l
og-with
-
optio
n
s' i
n
to main
t
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C Hamano
Merge branch 'j
k
/stash-lo
o
s
en-saf
e
t
y'
into main
t
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C Haman
o
Me
r
g
e
br
a
nch
'ar/clean
-
r
mdir-empty' into maint
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
Merge branch 'mg/s
h
a1-path-advise' into maint
commit
|
commitdiff
|
tree
2011-05-04
Va
l
entin Haenel
git-add
.
txt
:
document '
a
dd
.
ignoreEr
r
ors'
Noticed-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
merge-one-file:
fi
x
broken merges
w
i
t
h
alternat
e
wo
r
k
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
a
d
d te
s
t
s
for
merge-i
n
dex /
merge-one-file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Ju
n
io C Hamano
Start 1
.
7
.
5
.
1 maintenance trac
k
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
J
u
n
i
o
C Hamano
Merge br
a
nch 'mg/x-ye
a
rs-12-
m
o
n
ths' into
maint
commit
|
commitdiff
|
tree
2011-04-29
Sy
l
vai
n
Rabot
git-send-email: fix missing space
in er
r
o
r
message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Junio C
H
amano
htt
p
: clear P
O
STFIELDS when initi
a
lizing
a s
l
ot
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
Gi
t
1
.
7
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C
Haman
o
d
i
ff-file
s
:
show
u
nmerged entries correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Ha
m
a
no
di
f
f: remo
v
e often
u
nus
e
d p
a
rameters from diff_unmerge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
diff
.
c:
r
etu
r
n filepai
r
from
d
i
f
f_unme
r
g
e()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C
Hamano
t
est: use $_z40 from
tes
t
-lib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-21
Mich
a
el J Gruber
da
t
e: avoi
d
"
X
ye
a
r
s
, 12
months"
i
n relative da
t
e
s
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
Sync
w
ith 1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Ju
n
io C Hamano
Git 1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Michael J Grub
e
r
g
it-s
v
n
.
txt: Document --mergeinfo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-18
J
un
i
o C Ham
a
no
Reve
r
t "run-command: p
r
ettify -D_FORTIFY_SOURCE
work
a
round"
commit
|
commitdiff
|
tree
2011-04-14
Junio C Hamano
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2011-04-14
René Scharfe
a
r
chive: docum
e
nt limitation o
f
tar
.
umask config setting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
M
ichael J Gruber
t3306,t53
0
4
: avoid clock skew issues
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Mi
c
hael J Gruber
git
.
txt: fix list
c
ontin
u
a
t
i
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Juni
o
C
H
amano
Git 1
.
7
.
5-r
c
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Junio C
Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2011-04-13
Jun
i
o C Hama
n
o
Merge bra
n
c
h
'jc/r
e
v-list
-
opti
o
ns
-
fix' into
maint
commit
|
commitdiff
|
tree
2011-04-13
J
u
nio C Hamano
Merge branch 'js/check
o
u
t-untracked-s
y
mlink' into maint
commit
|
commitdiff
|
tree
2011-04-13
J
i
m Meyer
i
ng
r
e
move doubled
w
ord
s
, e
.
g
.
,
s
/to to/to/, a
n
d
f
ix related
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Ramkumar Ramachandra
reve
r
t:
H
i
de '-r' op
t
io
n
in de
f
ault us
a
ge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Johan
Herland
-
-d
i
rstat: In case of
r
enames, use target filename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Junio C
H
amano
M
e
rge branch 'js
/
ch
e
ckout-untr
a
cked-symlin
k
'
commit
|
commitdiff
|
tree
2011-04-12
Junio C H
a
mano
Merge b
r
anch 'nd/in
i
t-
g
itdir'
commit
|
commitdiff
|
tree
2011-04-12
Johannes S
i
xt
t2021: mark a test
a
s fixed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Johan
n
es Sixt
t0001: guard
a new tes
t
with SYMLINKS pr
e
requisi
t
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
J
o
han Herland
T
e
ach --di
r
stat
n
ot to comple
t
el
y
ign
o
re rearra
n
ged
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Æ
v
ar
Ar
n
fjörð B
j
a
r
mason
Makef
i
le
:
e
x
t
r
act Q
_
()
so
u
rc
e
strings as nge
t
text
(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Ramsay Jones
i18n: avoid p
a
rent
h
esiz
e
d
s
tring as array i
n
it
i
alizer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--d
i
r
s
ta
t
-by-file: Make it fas
t
er
and more c
o
rrect
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Joh
a
n
Herland
--
d
irs
t
at: Des
c
ribe non-obvious differenc
e
s
r
elative
.
.
.
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
M
erge
git://git
.
bogomips
.
or
g
/g
i
t-
s
vn
commit
|
commitdiff
|
tree
2011-04-11
Juni
o
C Hama
n
o
Merge
g
i
t
://git
.
kernel
.
o
rg/pub/s
c
m/gitk/g
i
tk
commit
|
commitdiff
|
tree
2011-04-07
D
a
n
M
cGee
st
a
sh: ensure
-
-no-keep-in
d
e
x and --pat
c
h can be used
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-07
Dan McGee
st
a
s
h: add tw
o
more
t
ests fo
r
-
-
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 with 8 sp
a
ces for
c
o
n
si
s
tency
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
upload-
p
ack: sta
r
t pack-
o
b
j
ects b
e
fore async r
e
v-list
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
J
u
n
i
o
C Hamano
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
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 Hamano
Merge b
r
a
n
ch 'n
m
/ma
i
n
t
-conflicted-submodule-entries
.
.
.
commit
|
commitdiff
|
tree
2011-04-06
Jun
i
o
C
Ham
a
no
Merge b
r
anch 'mg/rev-list-n-reverse-doc
'
into m
a
i
n
t
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Mer
g
e
bra
n
c
h 'jk/m
a
int-remo
t
e-mi
r
r
o
r-s
a
fer'
commit
|
commitdiff
|
tree
2011-04-06
Junio C Ha
m
ano
Merge b
r
anch '
m
g
/
doc-revisions-
t
xt'
commit
|
commitdiff
|
tree
2011-04-06
Jeff K
i
n
g
s
t
ash: drop dirty
worktree check on
a
pply
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Ju
n
io C
H
aman
o
Teach co
r
e
.
bigfile
t
hre
a
shold to pack
-
objects
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Jon Seymour
stash: fix
f
alse positive in th
e
i
nvalid
r
ef test
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
stash: fix accidental ap
p
l
y
of non-existent
stashes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-04
Michae
l
J
G
r
u
ber
revisions
.
t
x
t: language improv
e
ments
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-04
Junio C H
a
mano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2011-04-04
Junio C
H
amano
Merge branch 'jl/s
u
bmodule-fetc
h
-
on-demand'
commit
|
commitdiff
|
tree
2011-04-04
J
unio
C
Hamano
M
erge branch 'jc/rev-lis
t
-opti
o
ns-fix'
commit
|
commitdiff
|
tree
2011-04-04
SZE
D
ER Gábo
r
Doc
u
mentation: trivial grammar fix in cor
e
.
w
o
rkt
r
ee
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-04
Jakub
Narebsk
i
gitweb: Fix parsing o
f
negative fractional tim
e
zo
n
es
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-04
Jun
i
o
C
Ham
a
no
Merge br
a
nch 'nm/maint-conflicted-submodule-ent
r
ies'
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
Merge branch '
m
aint'
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
S
tart preparing for 1
.
7
.
4
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-03
Jeff K
i
ng
pull: do
n
o
t
clobbe
r
untra
c
ked fi
l
es o
n
i
nitia
l
pull
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-03
Junio
C
Haman
o
Merge branch 'jc
/
index-
u
pd
a
te-if-able'
i
n
to main
t
commit
|
commitdiff
|
tree
2011-04-03
J
unio C Hamano
Merge bra
n
ch 'lt/de
f
au
l
t-abbrev' into maint
commit
|
commitdiff
|
tree
2011-04-03
Junio C
Hamano
M
e
rge branch 'jc/maint-rev-list-culled-boundary' i
n
to
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Junio C Ha
m
ano
M
e
r
ge branch 'mm/m
a
int-log-n-with
-
diff-filt
e
ri
n
g' into
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Juni
o
C
H
ama
n
o
Merge branch
'
jk/format-patch-m
u
ltili
n
e-
h
eader' into
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
Merge b
r
anc
h
'jn/maint
-
instaweb-plack-fix'
into
m
ain
t
commit
|
commitdiff
|
tree
2011-04-03
J
u
n
io C Hamano
Merg
e
bra
n
ch 'lp/config-vername-chec
k
'
into
m
aint
commit
|
commitdiff
|
tree
2011-04-03
Michael
J
Gruber
s
ha1_name:
S
uggest c
o
mmit
:
.
/file for path
i
n subdir
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-03
Michael
J Grub
e
r
t
150
6
: fac
t
or
out test
f
or "D
i
d
you
m
e
an
.
.
.
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-03
Jonathan Nieder
com
p
at: ad
d
missing #include
<
sys/resource
.
h>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-03
Lawrence Mitchell
git
.
e
l
: Don'
t
use fo
n
t-lock
-
compile-keywords
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-03
Ævar A
r
nfjörð B
j
armason
t2019-checkout-ambiguous-ref
.
sh: depend on C_
L
OCALE_OUTPUT
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-03
Dan McGee
Fix two unused variable w
a
rning
s
in gcc 4
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-03
Dan
McGee
Re
m
ove old b
i
naries from
.
gitignore
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-03
St
e
phen
B
oyd
s
p
a
rse: Fix e
r
rors and silence warnings
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
U
p
d
ate release
n
otes
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next