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 'js/blame-parsename' into maint
2011-05-13
J
unio C Hamano
Merge bra
n
ch 'js/
b
lame-parsename' into
m
a
int
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C Haman
o
Merge
branc
h
'gr/cvsim
p
o
r
t-alt
e
r
native-cvspass-
l
ocation
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
amano
Mer
g
e bra
n
ch 'c
j
/
p4merg
e
' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C Haman
o
Mer
g
e
branch 'jk/merg
e
-one-fil
e
-working-tree' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
io C
Hama
n
o
Merge br
a
nch
'jc/
f
ix-
d
i
f
f-f
i
le
s
-unmer
g
ed
'
into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Mer
g
e b
r
anc
h
'm
z
/m
a
int-rename-unmerged' into
m
ain
t
commit
|
commitdiff
|
tree
2011-05-13
Joha
n
He
r
la
n
d
t5400: Fix a
couple of
t
y
pos
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
J
o
ã
o
Britto
Remo
v
e duplicated "is a"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Junio C Hama
n
o
t3701:
f
ix here
do
c
um
e
nt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Michae
l
J Gruber
git-fast-i
m
port
.
txt: --relat
i
v
e-marks takes no pa
r
ameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
D
ima
Sharov
shell: add missing
i
nitia
l
ization of argv0_path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Brian Gernhardt
t/annotate-tests: Use echo
& cat instead of sed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
amano
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
Mer
g
e bran
c
h 'jh/dirstat' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
e
rge bra
n
ch 'sp/mai
n
t-cle
a
r-postfields' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
aman
o
Merge branch 'jk/m
a
i
nt-stash
-
oob'
into
m
a
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
amano
Merge branch 'jk/
m
aint-
u
pload-pack-shallo
w
'
i
n
to maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C Ham
a
no
Merge branc
h
'dm/s
t
ash-k-i-p' into
main
t
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Hamano
Merge branc
h
'jc/
p
ack-obj
e
cts-bigfile' into main
t
commit
|
commitdiff
|
tree
2011-05-04
J
unio C Hamano
Merge branch
'mg/re
f
l
o
g
-
with-options' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Haman
o
Me
r
ge branch 'jk/
s
tash
-
lo
o
sen-
s
afety
'
into
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
mano
Merge branch 'ar
/
clean-rmdi
r
-
e
mp
t
y' into maint
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C
H
a
mano
Me
r
ge bran
c
h '
m
g/sha1-path-a
d
vise' into mai
n
t
commit
|
commitdiff
|
tree
2011-05-04
Val
e
ntin Haen
e
l
git
-
ad
d
.
txt: docum
e
nt 'add
.
igno
r
eErrors'
Noticed-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Ciar
a
n
Jessup
P
a
s
s
empty file to p4merge where no
b
ase is
s
u
itable
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Guy Rouilli
e
r
Look for p
a
ss
w
or
d
in both CVS and
C
V
SNT pas
s
word f
i
les
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
m
erge-one-file: fix broken m
e
r
g
es with alter
n
ate
w
o
rk
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jef
f
Ki
n
g
add tests for merge-
i
nde
x
/
merge-one-file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C
Haman
o
Start 1
.
7
.
5
.
1
maintenance t
r
ack
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Juni
o
C
Hamano
M
erge branc
h
'mg/x
-
y
ears-12-months'
i
n
to maint
commit
|
commitdiff
|
tree
2011-04-29
Syl
v
a
in
R
a
bot
git-send-email: fix missin
g
space in error
message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Josh S
t
one
blam
e
: tolerate bogus e-mail
a
ddresses a bit bett
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Junio C Haman
o
http:
c
lea
r
POSTFIEL
D
S when ini
t
ializing a slot
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Ju
n
io C H
a
m
a
no
Git
1
.
7
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
u
n
i
o
C Hamano
diff-f
i
le
s
: show un
m
erged entr
i
es
correctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
u
nio C Hamano
diff: re
m
ove ofte
n
unused parameters f
r
o
m diff_unmerge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
u
nio
C
Hama
n
o
diff
.
c:
retu
r
n filepair from di
f
f_unmerge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
u
nio C
Ha
m
ano
test
:
use $_z40 f
r
om t
e
st-lib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-21
Michael
J
Gru
b
er
date
:
avoid "
X
years, 12 months"
in
r
elative dates
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
J
u
nio C Hamano
Git 1
.
7
.
5-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio C
Ham
a
no
Sync
wit
h
1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Hamano
Git 1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Michael J Gruber
git
-
svn
.
txt: Docum
e
nt --
m
er
g
einfo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-18
Junio C Hamano
Re
v
ert "run-command: p
r
e
t
ti
f
y -D_FORTIF
Y
_SOURCE
w
or
k
around"
commit
|
commitdiff
|
tree
2011-04-14
Junio
C
H
a
mano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2011-04-14
René Scharfe
arch
i
ve: docu
m
ent limitation of tar
.
um
a
sk config
s
e
t
ting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
M
i
chae
l
J Gruber
t
3306,t5304: avoid clo
c
k skew
iss
u
e
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Michael J Gru
b
er
g
i
t
.
txt: fix list continua
t
ion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Junio C
H
a
m
ano
Git 1
.
7
.
5-rc
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Ju
n
io
C Ham
a
no
Merge
b
ranch '
m
aint'
commit
|
commitdiff
|
tree
2011-04-13
J
unio C Hamano
Merge branch '
j
c/r
e
v-list-op
t
ions
-
fix' into
m
ai
n
t
commit
|
commitdiff
|
tree
2011-04-13
Junio C Haman
o
Merge
b
r
an
c
h '
j
s/ch
e
c
k
out-untr
a
cked-s
y
mlink' int
o
maint
commit
|
commitdiff
|
tree
2011-04-13
Jim Meyering
remove do
u
ble
d
words, e
.
g
.
, s/to
t
o
/to/, a
n
d fix related
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Ramkumar
R
a
m
achandra
revert
:
Hide '-r' optio
n
i
n default usage
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Joh
a
n
Herl
a
nd
-
-
d
i
r
stat: In case
o
f renames, use
ta
r
get filename
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
Junio C Hama
n
o
Merge br
a
nch 'js/
c
heckout-untr
a
c
ked-s
y
mlink'
commit
|
commitdiff
|
tree
2011-04-12
Juni
o
C Hama
n
o
Merge branc
h
'nd/init-
g
i
t
d
ir'
commit
|
commitdiff
|
tree
2011-04-12
Johannes Sixt
t2021:
m
ark a te
s
t as fixed
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-12
J
ohannes
S
ixt
t0001: guard
a
n
e
w test wi
t
h SYMLI
N
KS prere
q
uisit
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Jo
h
an Herland
Teach --dirstat not to complete
l
y
i
g
nore rearranged
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Æ
var Arnfjörð Bjarmason
Makefile:
e
xtr
a
ct Q_() source strings as
n
gettext()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Ramsay J
o
nes
i18n: avo
i
d parenthesized
s
tri
n
g as array initializer
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Johan Herland
--dir
s
tat-by-file: Make i
t
faster and more correc
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-11
Joha
n
Herland
--di
r
sta
t
: Des
c
ribe non-ob
v
ious 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
J
u
nio C Hamano
Merge git://git
.
bogomips
.
o
r
g
/git-svn
commit
|
commitdiff
|
tree
2011-04-11
Junio
C
Hamano
Merg
e
git://git
.
kernel
.
org/pub/s
c
m/gitk/gitk
commit
|
commitdiff
|
tree
2011-04-07
Dan M
c
Gee
stash: ensure --no-keep-index a
n
d --patch
can be
used
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-07
D
an McG
e
e
stash: add
two more tests for
-
-no-keep-index
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-07
Andr
e
w
G
arb
e
r
git-p4: r
e
place each
t
a
b
w
it
h
8 spaces for consi
s
tency
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
u
p
l
oa
d
-pack: s
t
art pack-objects before
a
s
y
n
c rev-list
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
G
i
t 1
.
7
.
5-r
c
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Juni
o
C Hama
n
o
Sync with 1
.
7
.
4
.
4
commit
|
commitdiff
|
tree
2011-04-06
Junio C
H
am
a
no
Git
1
.
7
.
4
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Merg
e
b
r
anch
'nm/maint-c
o
nflict
e
d
-submodule-entrie
s
.
.
.
commit
|
commitdiff
|
tree
2011-04-06
Juni
o
C Hamano
Mer
g
e br
a
nch 'mg/rev-li
s
t-n-rev
e
r
s
e-do
c
' i
n
t
o maint
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Me
r
ge bran
c
h
'
jk/main
t
-remote-mirror-safer'
commit
|
commitdiff
|
tree
2011-04-06
Ju
n
i
o
C
H
a
ma
n
o
Merge branc
h
'mg
/
doc
-
re
v
isions-txt
'
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
stash: dr
o
p dirty workt
r
ee check on a
p
ply
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Junio C Haman
o
Teach core
.
bigfileth
r
eashold to
p
a
c
k
-obj
e
c
ts
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Jon Se
y
m
o
ur
stash:
fix
f
alse
p
os
i
tive in t
h
e invalid
r
ef test
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
stash: fix ac
c
i
d
ental apply o
f
non-
e
xistent
stashe
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-04
M
ichae
l
J
G
rub
e
r
revis
i
ons
.
t
x
t: language improvements
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-04
J
unio
C
H
a
mano
Merge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2011-04-04
J
u
nio C Hamano
M
erge b
r
anch 'jl/
s
ubmodule-fetch
-
on-demand'
commit
|
commitdiff
|
tree
2011-04-04
Junio C Hamano
Merg
e
bra
n
ch
'jc/rev-list
-
opti
o
ns-
f
ix'
commit
|
commitdiff
|
tree
2011-04-04
SZEDER Gábo
r
Docu
m
en
t
ation: trivial grammar fix
i
n core
.
worktree
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-04
Jakub Narebski
gitweb: Fix parsing
o
f negative fractional
timezones
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-04
J
u
nio
C H
a
mano
M
erge branch '
n
m/m
a
int-confl
i
cted-submodule-entries'
commit
|
commitdiff
|
tree
2011-04-03
Junio C Ham
a
no
Me
r
g
e
branc
h
'maint'
commit
|
commitdiff
|
tree
2011-04-03
Jun
i
o C Hama
n
o
Start preparing for 1
.
7
.
4
.
4
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-03
J
ef
f
Ki
n
g
pull
:
do
n
ot
cl
o
bber
u
n
t
racked files
o
n initial pull
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-03
Juni
o
C
H
a
m
ano
Merg
e
branc
h
'jc/i
n
dex-update-if-
a
ble
'
into mai
n
t
commit
|
commitdiff
|
tree
2011-04-03
Juni
o
C
Hamano
M
e
rge branch
'lt/de
f
ault-abbrev'
i
nt
o
maint
commit
|
commitdiff
|
tree
2011-04-03
Junio
C
Hamano
Mer
g
e
branch 'jc
/
maint-rev
-
list-
c
ulled-b
o
undary' into
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
J
u
ni
o
C Hamano
Merge bran
c
h 'mm/ma
i
n
t-log-n-with-diff-
f
ilteri
n
g
' into
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
J
u
nio C
Ha
m
ano
Merge branch 'jk/format
-
p
at
c
h-mu
l
tiline-
h
ead
e
r
'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Junio C Ham
a
no
Merge branch 'jn/maint
-
instawe
b
-pl
a
ck-
f
ix' into maint
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hamano
Merge branch 'lp/conf
i
g
-
vername-c
h
e
ck' i
n
to
maint
commit
|
commitdiff
|
tree
2011-04-03
Michael J Gruber
sha
1
_name: Sug
g
est c
o
mmit:
.
/file for path in
s
ubdir
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-03
Michael J Gruber
t1506: factor out t
e
st
for
"D
i
d yo
u
mean
.
.
.
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next