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
init/clone: remove short option -L and document --separate-git-dir
2011-05-25
Nguyen Thai Ng
o
c Duy
i
nit/cl
o
ne: remove short
o
ption -L an
d
document --se
p
arate
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Michael J
G
rub
e
r
git-svn: Fix git
s
v
n
log --s
h
ow-c
o
mmit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
Junio C H
a
mano
Git 1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-20
J
onathan Nieder
provide a co
p
y of the LGP
L
v2
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
Update draft releas
e
n
o
tes
to
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge br
a
nch
'j
n
/mai
n
t-format-patch-
d
oc' into main
t
commit
|
commitdiff
|
tree
2011-05-16
Junio C Hamano
Merge branch '
s
s/cherr
y
-
pick-x-d
o
c'
i
n
t
o
ma
i
nt
commit
|
commitdiff
|
tree
2011-05-16
Junio C
Haman
o
Merge b
r
anch 'v
r
/mer
g
e-base-doc' int
o
ma
i
nt
commit
|
commitdiff
|
tree
2011-05-16
J
unio C
H
a
mano
Mer
g
e
b
ranch '
s
r/ma
i
n
t-
f
a
s
t-import-tight
e
n-opti
o
n
-parsing
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io C
Hamano
M
e
rge branch 'jc/t1506-shell
-
p
aram
-
expa
n
sion-gotcha
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
Ju
n
io C Hamano
Mer
g
e
bra
n
ch 'jc/fix-a
d
d
-u-unmerged
'
i
n
t
o maint
commit
|
commitdiff
|
tree
2011-05-16
Junio
C
Hamano
Merg
e
branch 'jn/gitweb-dependency'
into
m
aint
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
am
a
no
M
e
r
ge branch 'j
c
/
maint
-
branch
-
m
e
rgeopt
i
ons' i
n
to m
a
i
nt
commit
|
commitdiff
|
tree
2011-05-16
Junio C
H
amano
Merge branch 'jc/main
t
-add-p-ov
e
rlappi
n
g-
h
unk
s
' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-16
J
i
m
Meyering
Documenta
t
ion/git-fsck
.
txt: fix typo: unre
a
dable
-
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio C H
a
mano
Update
draft r
e
le
a
s
e notes to
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
J
u
nio
C
Hamano
Merge
b
r
anch 'cn/
f
ormat
-
p
a
tch-quiet'
into maint
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
H
amano
Merge
br
a
nch 'jm/merg
e
tool-submodules'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-15
Ju
n
io C Hamano
Merge branc
h
'jk/fo
r
mat-patch-quote-spec
i
al-
i
n-from
.
.
.
commit
|
commitdiff
|
tree
2011-05-15
Junio
C
H
a
m
ano
Merge b
r
a
nch 'vh/
g
it-svn-d
o
c
'
int
o
maint
commit
|
commitdiff
|
tree
2011-05-15
Junio C Ha
m
ano
git_open_noatime(): drop u
n
used para
m
e
ter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Junio
C H
a
mano
sh
a
1_fil
e
: t
y
pofix
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-15
Jo
n
a
t
han Nie
d
er
add, merge, diff:
do
not use strcasecmp
t
o compare
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hama
n
o
Prepar
e
fo
r
1
.
7
.
5
.
2
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-13
Junio C Ha
m
ano
M
erge branch 'aw/mai
n
t-rebase-i-p-no-
f
f' into maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
amano
Merge branch 'js/b
l
a
m
e-parse
n
ame
'
into maint
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C Hamano
Merge bra
n
ch 'gr/
c
vsimport-al
t
ernative-cvs
p
ass-
l
ocation
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
J
u
n
io C Hamano
Merge branch 'cj/p4merge' into maint
commit
|
commitdiff
|
tree
2011-05-13
J
unio C Hamano
Merge
b
r
a
n
c
h
'
jk/merge-o
n
e-f
i
le-working-t
r
ee' into
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
J
u
nio C H
a
mano
Merge branch '
j
c/fi
x
-
diff-files-unmerged' into maint
commit
|
commitdiff
|
tree
2011-05-13
Jun
i
o C
Ham
a
no
Mer
g
e
branch 'mz/m
a
i
nt-rename-unmerg
e
d' in
t
o maint
commit
|
commitdiff
|
tree
2011-05-13
Johan H
e
rland
t5400: Fix a couple of typos
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-09
J
unio
C
H
aman
o
t1507: a
v
oid
"${paramete
r
<
o
p>'word'}" inside double
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Junio C Ha
m
a
no
t3701
:
ad
d
-p-fix
m
akes
the last tes
t
t
o
p
ass
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Ja
k
ub
N
arebski
R
e
move
g
i
twe
b
/gitwe
b
.
cgi and
othe
r
legacy
targ
e
t
s
from
.
.
.
Requested-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-08
Jakub
N
a
reb
s
ki
git-instaweb: Si
m
p
l
i
f
y
b
uild depende
n
cy o
n
gitweb
Reported-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Junio
C
Hamano
me
r
ge: make branc
h
.
<name>
.
mergeoption
s
correctly override
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
João Br
i
tto
R
emove duplicated "is
a"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-06
Sverre R
a
bbelie
r
fast-import: fix option parser for no-
a
rg option
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
J
u
nio C Hamano
t
3701: fix here document
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Michael J Gruber
git-fast-import
.
t
xt: --
r
elative-marks t
a
kes no
p
arameter
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
Di
m
a Sharov
shell: add
missing initia
l
ization of argv0_path
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-05
B
r
ian Gernhardt
t/annotate
-
tests: Use echo & cat instead of
s
e
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C Ha
m
ano
Git 1
.
7
.
5
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-04
Junio C H
a
m
a
no
Merge branch
'
jh
/
dirst
a
t' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
J
unio C Hamano
Merge bra
n
ch 'sp/maint-clear-postfie
l
d
s' into maint
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C H
a
mano
Merge branch 'jk/mai
n
t
-stash-oob' into maint
commit
|
commitdiff
|
tree
2011-05-04
J
u
nio
C Hamano
M
er
g
e branch 'jk
/
maint-uplo
a
d
-
pack-sh
a
llow' into maint
commit
|
commitdiff
|
tree
2011-05-04
Ju
n
io C Hamano
Merge b
r
a
n
ch
'dm/stash-k
-
i
-
p' i
n
t
o
maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Ha
m
a
no
Mer
g
e branch 'jc
/
pack-objects-bigfile'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C Hamano
Merge b
r
an
c
h 'mg/reflog-wit
h
-options'
i
nto maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
a
m
ano
Merge branch 'jk/stash-lo
o
se
n
-saf
e
ty' into m
a
int
commit
|
commitdiff
|
tree
2011-05-04
Junio C
H
amano
M
erge
b
ranch 'ar/
c
lean-rmdir-empty' into maint
commit
|
commitdiff
|
tree
2011-05-04
J
unio C Hama
n
o
Merge branch 'mg/sha1-
p
ath
-
advise' into m
a
i
n
t
commit
|
commitdiff
|
tree
2011-05-04
Va
l
entin Ha
e
n
el
g
it-add
.
txt
:
d
o
cume
n
t 'add
.
ign
o
reErrors'
Noticed-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Ciaran
J
essup
Pa
s
s em
p
t
y
f
ile t
o
p
4
merge where no
b
ase is s
u
itable
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-05-01
Guy Rouillie
r
Look for password in both CV
S
and CV
S
NT
pas
s
word f
i
les
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Jeff
King
merge-one
-
file: f
i
x broken merge
s
with alter
n
ate work
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Je
f
f King
add tests for merge-index /
m
er
g
e-one-file
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hama
n
o
"
a
dd -p": w
o
rk-
a
ro
u
nd an old laziness
th
a
t does n
o
t
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C
H
a
mano
a
d
d--interac
t
i
v
e
.
p
e
rl:
fa
c
tor
o
u
t repeated --recount
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Ham
a
no
t3
7
01:
E
diting a split hunk in an "add -p" sessi
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Haman
o
add -p:
'q' should really quit
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
S
t
art 1
.
7
.
5
.
1
maintena
n
c
e track
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Junio
C Hamano
Merge branch 'mg/x-years-12-months' into
maint
commit
|
commitdiff
|
tree
2011-04-29
Sylvain
R
abot
g
it-send-e
m
a
il: fix
m
i
ssing space in error message
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-29
Josh Stone
blame:
t
olerat
e
bogus e-
m
ail addresse
s
a bit bett
e
r
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-28
Andrew
W
on
g
git-
r
e
bas
e
--inter
a
ctive
.
sh: p
r
ese
r
ve-merges f
a
ils
on
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Jeff King
pretty: quote r
f
c822 specia
l
s in email addresses
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Va
l
entin Haenel
git
-
svn
.
t
xt: small typeface improvements
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Val
e
ntin Ha
e
ne
l
git
-
svn
.
txt: move option descriptio
n
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
V
alentin Haen
e
l
git-svn
.
txt: fix
u
sage of
-
-add-author-fro
m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-26
Ju
n
io C Hamano
http: clear POSTFIELD
S
when initia
l
izin
g
a s
l
ot
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 Hama
n
o
F
ix
"
add
-
u" that sometimes
fails to
r
eso
l
ve unmerged
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
u
nio C Hamano
diff-files:
show unmerged entries c
o
rr
e
ctly
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
J
unio C
H
aman
o
diff: remo
v
e often u
n
used paramet
e
rs from diff_unmerge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Junio C
H
amano
diff
.
c: return fi
l
epair from diff_unmerge()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-24
Jun
i
o C Hamano
t
e
st: use $_z4
0
from test-lib
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-21
Michael J Gruber
date: a
v
oid
"
X
years
,
1
2
months"
i
n relative
d
ates
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio
C
Hamano
G
i
t
1
.
7
.
5-rc3
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Hamano
Sync with 1
.
7
.
4
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-19
Jun
i
o C Haman
o
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: Document --mergei
n
f
o
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-18
Junio C
Hamano
R
e
v
e
rt "
r
un-command
:
prettify
-D_FORTI
F
Y_SOURCE workaround"
commit
|
commitdiff
|
tree
2011-04-15
Sebastian Schuberth
doc: Clarify tha
t
"cherry-pic
k
-x"
d
oes not
use "git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-15
Jonathan Nieder
Documentati
o
n
: describe t
h
e
fo
r
m
at of messages
w
ith
.
.
.
Improved-by:
Junio C Hamano
<gitster@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-15
Jona
t
han
Nieder
Restructure d
o
cumentat
i
on fo
r
git-merge-base
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-15
Vincent va
n
Ravesteijn
Docume
n
t
a
tion: update
t
o git-merge-base
-
-octopus
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Junio
C
Ha
m
ano
Merg
e
branch
'
m
aint
'
commit
|
commitdiff
|
tree
2011-04-14
R
ené Scharfe
archive:
document
limitation o
f
tar
.
umask config setting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Michael J Gruber
t3306
,
t5304: avoid clock s
k
e
w
i
ssues
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-14
Michael J Gru
b
er
git
.
txt: fix list 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
J
unio C Ha
m
a
n
o
M
erge branch 'maint'
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
Merge b
r
anch 'jc/rev-l
i
st-options-
f
ix' in
t
o maint
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hama
n
o
Merge branch 'js/checkout-untracked-sym
l
i
n
k
' into m
a
int
commit
|
commitdiff
|
tree
2011-04-13
Jonathon Mah
mergetool: T
e
ach abo
u
t su
b
modules
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
Jim Me
y
ering
r
emove doubled
words, e
.
g
.
, s/to to/to/, and fix relat
e
d
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2011-04-13
R
a
m
kumar Ramachandra
re
v
ert:
Hi
d
e '-r'
o
ptio
n
i
n default us
a
ge
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next