repo.or.cz
/
git
/
mjg.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'rr/doc-content-type' into maint
2011-05-04
J
u
ni
o
C Hamano
Mer
g
e branch 'mg/sh
a
1-p
a
th-advise' into m
a
in
t
commit
|
commitdiff
|
tree
2011-05-04
Valentin Ha
e
n
e
l
git-add
.
txt: document 'ad
d
.
ignoreE
r
ro
r
s'
Noticed-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Ciara
n
Jes
s
up
Pass empty file to p4merge where no base is suit
a
ble
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
G
uy Rou
i
l
lier
Look for pas
s
word in both CVS and CVSNT pas
s
word files
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
e
ff King
me
r
ge-one-file: fix b
r
o
k
en merges
with alternate work
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
e
ff Kin
g
add
tests for merge-index /
merge-one
-
file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C
H
amano
"add -p": work-arou
n
d
a
n old laziness that
do
e
s not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
a
dd--interactive
.
perl: fa
c
tor out repeated --recou
n
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
t3
7
0
1: E
d
itin
g
a split h
u
n
k in an "a
d
d -p" ses
s
i
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
add -p: 'q
'
shoul
d
really quit
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Ju
n
io C
H
ama
n
o
S
t
art 1
.
7
.
5
.
1 mainte
n
ance 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-mon
t
hs' into
m
aint
commit
|
commitdiff
|
tree
2011-04-29
S
y
lvain Rabot
git-send-email: f
i
x missin
g
space in err
o
r message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Josh
Stone
blam
e
: toler
a
t
e bog
u
s e-mai
l
addresses a bit bett
e
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-28
Ka
c
per Kornet
H
onor
$
(prefix) se
t
in config
.
mak* when defining ETC_
G
IT
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-28
Andre
w
Wong
git-re
b
ase--interactive
.
s
h
: preserve-merges fails on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-27
Michael J Gruber
config
.
tx
t
,diff-options
.
txt: porc
e
lai
n
v
s
.
p
lum
b
ing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
J
e
ff K
i
ng
pre
t
t
y
: quote r
f
c
8
22 sp
e
cials in email addresses
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Fraser Tweedale
gitweb:
s
upply '-n' to gzi
p
for identical out
p
ut
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Valentin Haenel
git-svn
.
txt: small typefac
e
improveme
n
t
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Val
e
ntin Haenel
git-svn
.
tx
t
: move option desc
r
iptions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Valentin Ha
e
ne
l
g
it-svn
.
txt: fix usage
of --add-author-from
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Junio
C
H
a
mano
h
ttp
:
clear POSTFIELDS when initia
l
iz
i
ng
a
slot
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-25
Junio
C Hamano
Merge
branc
h
'js/maint-1
.
6
.
6-send-pack-statele
s
s-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-04-25
Johanne
s
Sixt
s
end-pack
:
avo
i
d deadloc
k
w
h
en
p
ack-objec
t
dies early
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Ham
a
n
o
Git 1
.
7
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
J
uni
o
C Hamano
Fi
x
"add -u" tha
t
someti
m
e
s fails to
res
o
lve unme
r
g
ed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hama
n
o
d
i
ff-files: sh
o
w u
n
merge
d
e
ntries correctly
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio
C Hamano
diff: rem
o
ve often u
n
used paramet
e
rs from d
i
ff_unme
r
g
e()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
diff
.
c: return
filepair from diff
_
unmerge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C
Haman
o
test: use $_z
4
0
from test-li
b
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-21
Michael
J Gr
u
ber
date:
avoid "X
y
ears, 12
m
onth
s
" in relative
dates
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-20
Jo
n
athan Nie
d
er
run-command
:
hand
l
e s
h
ort
w
rites and EINT
R
i
n die_child
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-20
Jonathan Ni
e
d
er
tests: check error message from run
_
command
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 with
1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Junio C Hama
n
o
Git 1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Stefa
n
S
p
erl
i
ng
r
emove
n
oi
s
e and
inaccuracies f
r
om git-svn docs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Johannes Sixt
Docum
e
ntation/format-patch:
s
u
gge
s
t Toggle W
o
r
d Wrap
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Michael J Grube
r
git
-
svn
.
txt: Document
--merge
i
nfo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-18
Junio C Hamano
Rever
t
"run-
c
ommand: pre
t
tify -
D
_FORTIFY_S
O
URCE w
o
rkaround"
commit
|
commitdiff
|
tree
2011-04-15
S
e
bastian
S
chubert
h
doc: Clarify that "cherry-pick -x"
d
oes no
t
use "gi
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-15
J
onathan
Nied
e
r
Do
c
umentation: publ
i
c
ize hints fo
r
sen
d
i
ng
p
atches
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-15
Jonathan Niede
r
Documentation: publicize KMail hin
t
s for s
e
nding patches
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-15
Jonathan N
i
eder
Documen
t
ation: hints fo
r
s
endin
g
patches inline with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-15
Jonatha
n
Nieder
Docume
n
t
a
tion: exp
l
ain how to check
for
p
a
tch corruption
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-15
J
unio C H
a
mano
Merge v1
.
7
.
5
-r
c
2 into jn/forma
t
-patch-doc
commit
|
commitdiff
|
tree
2011-04-15
Jonathan Nieder
Docume
n
tation: d
e
scribe the format
o
f m
e
ssages with
.
.
.
Improved-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-15
Jonathan N
i
e
d
e
r
Restructure documenta
t
ion fo
r
git-merge-base
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-15
V
i
ncent van Ravestei
j
n
D
ocument
a
tion: update to git-merge-base --oc
t
opus
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
Juni
o
C Haman
o
Merge bra
n
c
h
'
maint'
commit
|
commitdiff
|
tree
2011-04-14
René Scharfe
archi
v
e: d
o
cum
e
n
t
li
m
itation of tar
.
um
a
sk confi
g
setting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
Mic
h
a
el J
G
ruber
t3306
,
t5304: avo
i
d clock skew is
s
ues
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
Michael
J
Gr
u
ber
gi
t
.
txt: fix
l
ist conti
n
u
a
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Junio C Hamano
Git
1
.
7
.
5-rc2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Ju
n
io C
Hamano
Merge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2011-04-13
Junio C
Haman
o
Merge branch
'
jc/rev-list-options-fix'
i
nto
maint
commit
|
commitdiff
|
tree
2011-04-13
Junio C Haman
o
Merge bran
c
h 'js/check
o
ut-un
t
racked
-
symlink' into ma
i
nt
commit
|
commitdiff
|
tree
2011-04-13
Jonathon
Mah
me
r
getoo
l
:
T
e
a
c
h abo
u
t sub
m
odule
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
J
i
m Meyering
remove dou
b
led words, e
.
g
.
, s/to t
o
/t
o
/, and fix related
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Ramkumar R
a
macha
n
dra
revert:
H
ide
'
-r' option
in
default usage
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
C
a
rlos M
a
rtín Nieto
f
orm
a
t-p
a
tc
h
: document
--quiet option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Carlos
Martín Nieto
format-patch
:
don't pass on the -
-
quiet flag
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Joh
a
n Herland
--dirstat: In
c
ase of rena
m
e
s
,
u
s
e target filename
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
Ju
n
io
C
Hama
n
o
Merg
e
bra
n
c
h 'js/checkout-untrack
e
d-s
y
mlink
'
commit
|
commitdiff
|
tree
2011-04-12
Junio
C
H
a
mano
Merge
b
ranch 'nd/ini
t
-gitdir'
commit
|
commitdiff
|
tree
2011-04-12
Johannes Sixt
t2021
:
ma
r
k
a t
e
st
as fixed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-12
J
ohannes Si
x
t
t0001
:
guar
d
a
n
ew te
s
t
w
i
th SYMLINKS prerequisite
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
J
o
han Herland
Teach --
d
ir
s
tat not to completely ignore rearranged
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Æ
v
ar Arnfjö
r
ð
B
j
armason
Makefile: ext
r
act
Q_() source
strings
as nget
t
ext()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Ra
m
say
J
ones
i18n: avoid pare
n
t
h
e
s
ized str
i
ng as array initia
l
ize
r
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Johan Her
l
and
--di
r
stat-by-f
i
le: Make it faster
and more correct
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Johan He
r
land
--dirstat:
Describe non-obv
i
ous differences relativ
e
.
.
.
Improved-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-11
Junio
C
Ham
a
no
Merge g
i
t://git
.
b
ogomips
.
org/git-s
v
n
commit
|
commitdiff
|
tree
2011-04-11
Junio C Hamano
Merge g
i
t
:/
/
git
.
kern
e
l
.
org/pub/scm/gitk/gitk
commit
|
commitdiff
|
tree
2011-04-07
Dan
M
cGee
st
a
sh: ensure --
n
o
-
keep-index
and -
-
patch can be u
s
ed
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-07
Dan
M
cGe
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
And
r
ew Garber
git-p4: replace each
tab with
8 spac
e
s fo
r
consis
t
ency
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Ra
m
kumar Ram
a
c
han
d
ra
Doc
u
mentation: A
l
l
ow custom diff
t
ools
to be specified
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Ramkumar
R
a
m
a
c
handra
Docu
m
entation: A
d
d diff
.
<driver>
.
* to
config
Helped-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Ramkumar Ram
a
c
h
and
r
a
Documentatio
n
:
Move diff
.
<
d
river>
.
* from config
.
txt
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Ra
m
ku
m
a
r
Ramachandra
Documentation: Add filter
.
<driver>
.
* t
o
c
o
nfig
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Jeff King
upl
o
ad-
p
ack: start
p
a
ck-ob
j
ects before asyn
c
rev-list
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
J
unio C
H
a
m
ano
Git 1
.
7
.
5
-rc1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Jun
i
o
C
Ham
a
no
Sync with 1
.
7
.
4
.
4
commit
|
commitdiff
|
tree
2011-04-06
J
unio
C
Ha
m
ano
Git 1
.
7
.
4
.
4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Ju
n
io
C Hamano
Merge b
r
anch 'nm/maint-conflict
e
d-submodule-en
t
rie
s
.
.
.
commit
|
commitdiff
|
tree
2011-04-06
Junio C Hamano
M
erge branch 'm
g
/rev
-
l
ist-n-reverse-doc'
i
nto maint
commit
|
commitdiff
|
tree
2011-04-06
Junio
C
H
amano
Me
r
ge bran
c
h 'jk/
m
aint-r
e
mote-mi
r
r
or-safer
'
commit
|
commitdiff
|
tree
2011-04-06
J
u
n
io C Ha
m
ano
Merge branc
h
'
mg/doc-revi
s
i
on
s
-txt
'
commit
|
commitdiff
|
tree
2011-04-06
Jeff
King
stash: drop di
r
t
y
worktree check on a
p
ply
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
Junio C Ham
a
n
o
Teach core
.
bigfilethre
a
shold t
o
pack-objects
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
J
o
n Seymour
s
tash:
fi
x
fa
l
se posi
t
ive in the inv
a
lid ref te
s
t
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-06
J
eff King
stash: fix accident
a
l apply of non-exi
s
t
e
nt s
t
ashes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-04
Michael J
G
ruber
revisions
.
txt: language i
m
provements
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-04
Junio C Hamano
M
e
rge branch
'
maint'
commit
|
commitdiff
|
tree
2011-04-04
Junio C Ham
a
n
o
Merge branch 'j
l
/submodule-fetch-on-dem
a
nd'
commit
|
commitdiff
|
tree
2011-04-04
Junio C Hamano
Merge branch 'jc/rev-list-option
s
-fix'
commit
|
commitdiff
|
tree
2011-04-04
SZEDER Gábo
r
Docu
m
entati
o
n: trivial grammar fix
in cor
e
.
work
t
ree
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-04
Jakub
Nare
b
s
ki
gitw
e
b: Fix parsing of ne
g
a
tive fra
c
tional
t
i
mezones
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next