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
Jun
i
o C H
a
mano
M
erge branch 'js
/
bl
a
me-parse
n
ame'
i
n
t
o m
a
int
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
amano
Merge branch 'g
r
/cvsimpor
t
-a
l
tern
a
tive-cvspa
s
s-
l
oc
a
tion
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C Hamano
Merg
e
branc
h
'
c
j
/p
4
merge
'
into maint
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
i
o
C
Haman
o
Merge branch 'jk/m
e
rge-one-file
-
working-tree' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Ju
n
i
o C Hamano
Merge branc
h
'
jc/fix-d
i
ff-files-unm
e
rged' in
t
o
m
aint
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C Haman
o
Me
r
ge
b
r
a
nch 'm
z
/main
t
-rename-
u
nm
e
rged' into
maint
commit
|
commitdiff
|
tree
2011-05-13
Joh
a
n Herla
n
d
t5400: Fix a couple
o
f t
y
pos
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
J
oão Britto
Remove du
p
licated "is a"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Jun
i
o C
Hamano
t3701: fix here
d
ocument
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
M
ich
a
el
J
Gruber
git-fast-
i
mport
.
txt: --relative-mar
k
s tak
e
s no parameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Dim
a
Sharov
shell: a
d
d missing initializat
i
on of argv0_path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Brian G
e
rnhard
t
t
/annotate-tests:
Use echo
& cat instead of se
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Junio
C H
a
mano
Git
1
.
7
.
5
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C
Hamano
Merge bra
n
ch 'j
h
/dirstat' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
M
e
rge branch 'sp/
m
aint
-
clear
-
p
o
stfields
'
into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Haman
o
Merge
branc
h
'jk/maint-stash-oob' into
m
a
i
n
t
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
i
o
C Hamano
Me
r
ge branch 'j
k
/
m
aint-upload-pack-shall
o
w' i
n
t
o maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
ama
n
o
Merge
branch 'd
m
/stash-
k
-
i
-p' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
m
ano
Merge b
r
anch
'
j
c/pack-objects-
b
igfile
'
int
o
ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
mano
Merge branch 'mg
/
reflog-with-options' in
t
o m
a
int
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
am
a
no
Merge branch 'jk/s
t
ash-l
o
osen-sa
f
ety
'
i
nto ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
J
unio C Hamano
M
erge branch 'ar/clean-rmdir
-
empty' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hama
n
o
Merge branch
'
m
g/sha1-p
a
th
-
adv
i
se' into maint
commit
|
commitdiff
|
tree
2011-05-04
Valentin Hae
n
e
l
git-add
.
txt:
d
o
cument 'ad
d
.
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 Jes
s
up
Pass empty file to p4
m
erge where no
base is suitable
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
G
uy Rouilli
e
r
Look for p
a
ssword
i
n both CVS and CVSNT pass
w
o
rd
f
iles
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jeff
K
i
n
g
merge-on
e
-file: fix brok
e
n merges with alternate work
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
e
ff
Ki
n
g
add tes
t
s for merge-inde
x
/
me
r
g
e
-one-file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
u
nio C Haman
o
Start 1
.
7
.
5
.
1
mai
n
tenance track
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Ju
n
i
o
C Ham
a
n
o
Merge branch
'
mg/x-ye
a
rs
-
12-months' into maint
commit
|
commitdiff
|
tree
2011-04-29
Sylv
a
in Rabot
git
-
send-email: fix mis
s
ing space in error
m
essage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Josh Stone
blame: tole
r
ate bogus e-mail addresses a bit better
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
J
u
nio C Hamano
http: clea
r
POSTFIE
L
DS when ini
t
ializing a slot
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Juni
o
C H
a
mano
Git 1
.
7
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
J
u
nio C
H
amano
diff-files: show unmer
g
ed entries correctly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio
C
Hamano
d
iff
:
remove
o
f
te
n
unus
e
d parameters
from
diff_unmerge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
diff
.
c:
r
e
turn filepair f
r
om diff_un
m
e
rge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Juni
o
C Ham
a
no
test:
use $_z40 from test-lib
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-21
Mic
h
ael J Gruber
dat
e
:
avoid "X
y
ears
,
12 months" in relative dates
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Jun
i
o C
H
a
mano
Git 1
.
7
.
5
-rc3
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
J
u
nio C Hamano
Sync w
i
t
h 1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Hamano
G
i
t 1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Mi
c
h
ael
J Grube
r
gi
t
-svn
.
txt
:
Document -
-
m
ergeinfo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-18
J
unio C
H
a
m
ano
Rever
t
"run-comman
d
: prettify
-
D
_
FORTIFY_SOURCE workaround"
commit
|
commitdiff
|
tree
2011-04-14
Juni
o
C Hamano
Merge
bran
c
h 'm
a
in
t
'
commit
|
commitdiff
|
tree
2011-04-14
R
ené
S
charfe
a
rchive: document limitation of tar
.
u
m
ask config setti
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
Michael
J
Grub
e
r
t
3
3
06,t5304:
avoid clock skew issues
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
M
i
c
hael
J
Grube
r
git
.
tx
t
: fix l
i
st continuation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
G
it 1
.
7
.
5-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
M
e
rge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2011-04-13
Junio
C Ham
a
no
Merge branc
h
'jc/r
e
v
-l
i
s
t-options-f
i
x' into
maint
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
M
er
g
e
branch 'js/checkout-untracked-symlink' into maint
commit
|
commitdiff
|
tree
2011-04-13
Jim Meyering
remo
v
e d
o
ubled w
o
rds, e
.
g
.
, s/to to/to/,
a
nd f
i
x re
l
ated
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Ramkum
a
r Ra
m
achand
r
a
rever
t
:
Hide
'
-r' option in default
usage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Johan Herland
--dirstat: I
n
case of ren
a
mes, u
s
e tar
g
et filename
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Junio C Hamano
Merge branch 'js/checkout-untracked-symlin
k
'
commit
|
commitdiff
|
tree
2011-04-12
Ju
n
io C Hamano
Merg
e
bra
n
ch 'nd/
i
nit-g
i
tdi
r
'
commit
|
commitdiff
|
tree
2011-04-12
Jo
h
an
n
es
S
ix
t
t2021:
mark a test as fixed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Jo
h
annes Sixt
t
0
0
01:
guar
d
a new
test with SYMLINKS
prerequisite
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Johan
H
erland
Te
a
ch
-
-dir
s
tat
n
ot to completely ignore rearranged
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Æ
v
a
r
A
r
nfjörð
B
jarmaso
n
Make
f
ile: e
x
tract Q_() source strings
a
s ngett
e
xt()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Ramsay Jones
i18n:
avoid parenthesized
s
tring as array initializer
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Joh
a
n Herl
a
nd
--dir
s
tat-by-file:
M
a
ke it fas
t
er and more correct
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
J
o
han H
e
rland
-
-dir
s
tat: De
s
cr
i
be non-obvious diff
e
rences 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://g
i
t
.
bogomips
.
org
/
gi
t
-svn
commit
|
commitdiff
|
tree
2011-04-11
Juni
o
C Hamano
Merge git:/
/
git
.
k
e
rnel
.
org/pub/sc
m
/gitk/g
i
tk
commit
|
commitdiff
|
tree
2011-04-07
Dan McGee
s
t
ash: ensure
-
-
n
o-keep-ind
e
x
a
nd --patch c
a
n
b
e used
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-07
Dan M
c
Gee
stash: a
d
d
two more
tests for --no-kee
p
-ind
e
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-07
Andrew Garber
g
i
t-p
4
: replace each tab
with 8 s
p
aces f
o
r c
o
nsistency
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Je
f
f
K
ing
upl
o
ad-pack: start
pack-objects be
f
ore asyn
c
r
e
v-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-
r
c1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Ju
n
io C
Hama
n
o
Sync wi
t
h 1
.
7
.
4
.
4
commit
|
commitdiff
|
tree
2011-04-06
Jun
i
o C
H
a
mano
Git
1
.
7
.
4
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
J
u
nio C
Hamano
Merge branch 'nm/maint-conflicted-submodul
e
-entries
.
.
.
commit
|
commitdiff
|
tree
2011-04-06
Juni
o
C Ha
m
a
n
o
Merge
b
ranch 'mg/rev-l
i
st-n-reverse-doc
'
i
n
to maint
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
Merge branch 'jk/main
t
-remote-m
i
rror-safer
'
commit
|
commitdiff
|
tree
2011-04-06
Junio
C
Hamano
Merge
branch 'mg/d
o
c-rev
i
s
ions-tx
t
'
commit
|
commitdiff
|
tree
2011-04-06
J
e
ff
K
ing
stash: drop
d
irty w
o
rk
t
ree check o
n
apply
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Junio C
Hamano
Teach core
.
bigf
i
let
h
reasho
l
d to pack
-
ob
j
ects
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Jon Sey
m
our
stash: fi
x
f
alse positi
v
e in the i
n
v
alid ref test
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Jeff
K
ing
stas
h
: fix ac
c
ident
a
l apply of non-e
x
istent st
a
shes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-04
Michael
J
Gruber
revisions
.
txt
:
languag
e
improvements
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-04
J
u
n
i
o
C Hamano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2011-04-04
Junio C Hamano
Merge branch
'
jl/subm
o
d
u
le-fetch-
o
n-demand'
commit
|
commitdiff
|
tree
2011-04-04
Junio C Hamano
Merge branc
h
'jc/rev-list-optio
n
s
-fix'
commit
|
commitdiff
|
tree
2011-04-04
SZEDER
G
ábor
Document
a
tion:
trivial
g
rammar fix in core
.
wor
k
tre
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-04
Jakub
N
arebski
gitweb:
F
i
x
p
a
rs
i
ng
o
f negative
fractional
t
imez
o
nes
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-04
Junio C Ham
a
no
Merge branch 'nm/maint-co
n
flicted-s
u
bm
o
dule-entries'
commit
|
commitdiff
|
tree
2011-04-03
Junio
C
H
am
a
n
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hama
n
o
S
tart p
r
eparing for 1
.
7
.
4
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-03
Jeff Ki
n
g
pull: do not cl
o
bber
untracked files on initial pu
l
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-03
Junio C Ha
m
ano
Merge
branch '
j
c/index-upd
a
t
e
-if-able' into maint
commit
|
commitdiff
|
tree
2011-04-03
J
u
ni
o
C Hamano
Me
r
ge branch 'lt/d
e
fault-abbrev'
i
n
to maint
commit
|
commitdiff
|
tree
2011-04-03
Junio C
Ha
m
ano
Merge branch 'j
c
/maint
-
re
v
-list-c
u
lled-bo
u
ndary' into
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Junio C Hama
n
o
M
erge branch 'm
m
/maint-log-n-with-diff-fi
l
tering' into
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
J
unio C
Hamano
Merg
e
branch
'jk/format-patch-mul
t
iline-header' int
o
.
.
.
commit
|
commitdiff
|
tree
2011-04-03
Jun
i
o C Hamano
Merge branch 'jn/maint-instawe
b
-plack-fix' into
m
ai
n
t
commit
|
commitdiff
|
tree
2011-04-03
Juni
o
C
Hamano
Merge branch 'l
p
/config-ver
n
a
m
e-ch
e
c
k'
into
m
aint
commit
|
commitdiff
|
tree
2011-04-03
Michael J Grub
e
r
sha
1
_na
m
e
: Su
g
ge
s
t commit:
.
/file for
path in sub
d
ir
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-03
Michael J Gru
b
e
r
t15
0
6: factor ou
t
test for "Did you me
a
n
.
.
.
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next