repo.or.cz
/
git.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
config: make git_config_parse_parameter a public function
2011-05-13
J
u
nio C Hamano
Mer
g
e b
r
anch '
c
j
/
p4merge' into maint
commit
|
commitdiff
|
tree
2011-05-13
Juni
o
C Hamano
M
e
r
g
e br
a
nch 'jk/merge-one-file-worki
n
g-tree'
i
nto
.
.
.
commit
|
commitdiff
|
tree
2011-05-13
Junio C Hamano
Merge branch 'jc/
f
ix-diff-fi
l
e
s
-unmer
g
ed' int
o
maint
commit
|
commitdiff
|
tree
2011-05-13
Junio C
H
aman
o
Merge branch 'mz/maint-rename-un
m
erged'
into maint
commit
|
commitdiff
|
tree
2011-05-13
Johan
H
erland
t5400: Fi
x
a co
u
ple of typ
o
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-11
J
unio C Hama
n
o
Merge br
a
nch '
j
c/maint-1
.
7
.
4
-
p
a
thspec
-
stdin-and-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
Junio C
H
a
mano
Merge branch '
j
c
/
m
a
int-
1
.
6
.
6-pathsp
e
c-std
i
n-and-cmdline'
commit
|
commitdiff
|
tree
2011-05-11
J
u
nio C Hamano
setup_revisions():
t
a
k
e paths
p
ec fr
o
m
comm
a
nd
line
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-10
Felipe Contreras
git-comp
l
etion:
fix
re
g
ress
i
o
n in zs
h
support
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Joh
a
nnes Six
t
Hono
r
$
(
prefix) se
t
in config
.
mak* whe
n
defining ETC_GIT*
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-09
Junio C Hamano
Revert
"
Hon
o
r $(prefix) se
t
in config
.
mak* when
defining
.
.
.
commit
|
commitdiff
|
tree
2011-05-09
Junio
C
Haman
o
t1507: avo
i
d "${p
a
rameter<op>'word'}" ins
i
de doubl
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Junio
C
Haman
o
t
3
701: add-p-f
i
x
m
a
kes th
e
last t
e
st to
pass
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Jakub N
a
rebski
Remove gitweb/gitweb
.
cgi and
o
ther legacy targets from
.
.
.
Requested-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-08
Jaku
b
N
a
rebski
g
it-ins
t
aweb: S
i
m
p
li
f
y
bui
l
d
depen
d
ency on gitwe
b
Reported-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
J
unio C Hama
n
o
m
e
rge
:
make branch
.
<name>
.
mergeoptions co
r
rectly overr
i
de
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
João Britt
o
Remove
d
u
p
licated "is a"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-06
Sv
e
rr
e
Rabbelier
fas
t
-
imp
o
r
t
: fix option parser for no-arg options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Ju
n
io C Hamano
Merg
e
branch 'js/maint-1
.
6
.
6-
s
end-pack-stateless-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-05-05
Jeff King
send
-
pack: unbreak push
ov
e
r stateless r
p
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Valentin Haenel
git-r
e
set
.
t
xt
:
be
t
te
r
docs for '--pa
t
ch'
Mentored-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Va
l
entin
Haenel
git-checkout
.
tx
t
: bett
e
r do
c
s for '--patc
h
'
Mentored-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Valentin
H
aenel
git-stash
.
txt: better docs
fo
r
'
-
-patch'
Mentored-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
V
a
lentin
Haenel
git-
a
dd
.
tx
t
: docu
m
en
t
'interactive
.
sing
l
ek
e
y
'
Mentored-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Valentin Haenel
c
o
nfig
.
txt
:
'i
n
teractive
.
singlekey
;
i
s
used by
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Ju
n
io C Ham
a
no
t3701
:
fix here doc
u
ment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Michael J Grube
r
g
it-f
a
st-im
p
ort
.
tx
t
: --rela
t
ive-marks tak
e
s
n
o
parameter
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
D
im
a
Sha
r
ov
shell:
add missing ini
t
ial
i
z
a
tion of arg
v
0_path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-05
Bri
a
n
Gernhardt
t/an
n
o
tate-tests: Use echo &
c
at instead of sed
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-04
J
u
n
io C Hamano
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
Merge branch 'jh/dirstat' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch 'sp/main
t
-clear-postfields' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C Hama
n
o
Merge bra
n
ch 'j
k
/ma
i
nt
-
stash-oob' into maint
commit
|
commitdiff
|
tree
2011-05-04
Juni
o
C
H
amano
Merg
e
branch
'j
k
/maint-u
p
load
-
pack-shallow
'
int
o
m
aint
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Merge branch 'dm/s
t
ash-
k
-i-p' in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Jun
i
o C Hamano
Me
r
ge branch 'jc/pack-
o
bjects-bigfile'
in
t
o ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Junio
C
Hamano
Merge branch 'm
g
/
r
e
f
log-with-o
p
tion
s
' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio C
Hamano
Merge branch 'jk/
s
ta
s
h
-loosen-safety' into m
a
i
n
t
commit
|
commitdiff
|
tree
2011-05-04
Junio C Hamano
Mer
g
e branch 'ar
/
clean-rmdir-e
m
pty' into maint
commit
|
commitdiff
|
tree
2011-05-04
Junio
C Ha
m
ano
Merge br
a
nch 'mg/sha1-
p
a
t
h-advise' into ma
i
nt
commit
|
commitdiff
|
tree
2011-05-04
Valenti
n
Haen
e
l
git-add
.
txt: doc
u
me
n
t
'add
.
ignoreEr
r
or
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 Jess
u
p
Pass empty file
t
o
p4merg
e
where no base is suita
b
l
e
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-05-01
Guy
R
ouillier
Look for passw
o
rd in both CV
S
and
C
VSNT passwor
d
files
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jeff King
merge-one-
f
ile: fix bro
k
en m
e
r
ges with alternate wor
k
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
J
e
ff K
i
ng
a
dd tests for m
e
r
g
e
-i
n
dex
/ merge-one-file
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C
Hama
n
o
"add -p": w
o
rk-around
an old
l
a
z
i
ness that does
n
ot
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jun
i
o C Hamano
a
d
d--interactive
.
perl
:
f
a
ctor out repea
t
ed --recount
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
t3701: Editing a s
p
lit hunk in an "add -p" session
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Ju
n
io C Hamano
a
d
d -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
a
rt 1
.
7
.
5
.
1
m
a
i
n
t
enance track
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Junio C Hamano
Mer
g
e branch
'
m
g
/
x-years-12-months' into maint
commit
|
commitdiff
|
tree
2011-04-29
S
y
lvain R
a
bot
gi
t
-send-email: fi
x
missing
s
pace in error message
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-29
Jo
s
h
Stone
blam
e
:
t
olerate b
o
g
u
s e-mail a
d
dress
e
s
a
b
i
t better
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-28
Kac
p
er Kornet
Hono
r
$(
p
refix)
s
et
in con
f
ig
.
mak* wh
e
n defin
i
n
g ETC_
G
IT
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-28
Andrew
Wong
git-rebase
-
-in
t
eractive
.
s
h
:
p
res
e
r
ve-
m
erges fa
i
ls on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-27
M
icha
e
l J G
r
uber
config
.
txt,diff-op
t
ion
s
.
txt: porcelain
v
s
.
plumbing
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
J
e
f
f
K
ing
p
ret
t
y: quote r
f
c822 special
s
in email addres
s
es
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Frase
r
T
w
eedale
gitweb: supply '-n' to gzip fo
r
i
dentical output
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Va
l
en
t
in Hae
n
el
git-svn
.
txt: sma
l
l typeface improvements
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Vale
n
tin Haenel
git-svn
.
txt: move
option descriptions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
Valent
i
n Haenel
git-s
v
n
.
txt: fix usage
o
f --
a
dd
-
author-from
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
M
a
t
hias Lafeldt
t/README
:
unify doc
u
mentatio
n
o
f
te
s
t function args
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-26
J
unio C Ha
m
ano
htt
p
:
c
lear POSTFIELDS
w
hen initializing a
slot
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-25
Junio C Ham
a
no
M
e
r
ge bra
n
ch 'js/m
a
int-1
.
6
.
6-s
e
nd-pack-st
a
teless-rpc
.
.
.
commit
|
commitdiff
|
tree
2011-04-25
Johannes Sixt
send-
p
ack: avo
i
d
deadlock
when pack-o
b
ject
d
ies early
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
Fix
"add -u" that some
t
imes fails to
res
o
lve u
n
merged
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
d
i
ff-f
i
l
e
s: s
h
ow unme
r
ged entries correctl
y
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Hamano
di
f
f: remove often un
u
s
ed
p
ar
a
meters fr
o
m di
f
f
_
unmerge(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio C Haman
o
diff
.
c
:
ret
u
rn filepa
i
r fro
m
d
iff_unm
e
rge()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-24
Junio
C
H
amano
test: use $_z40 from test-lib
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-21
Michael J
G
ruber
date: avoid
"
X year
s
, 12
m
on
t
hs"
i
n relat
i
v
e dates
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-20
Jo
n
atha
n
Nieder
run-
c
ommand: handle short writes and EINTR in die_child
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-20
Jonatha
n
Nieder
tests:
c
he
c
k error message from run
_
command
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Junio C
H
a
mano
G
it
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 with 1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
J
u
nio C Hamano
G
i
t
1
.
7
.
4
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Stefan Sperling
rem
o
ve noise an
d
inaccur
a
cies fro
m
g
it-svn
d
oc
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Johanne
s
Sixt
D
ocumentati
o
n/f
o
rmat-patch
:
s
u
ggest T
o
ggle Word Wrap
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-19
Michael J Gruber
git-svn
.
txt: D
o
c
ument --
m
ergeinfo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-18
Junio
C Hamano
Revert "r
u
n-
c
ommand
:
pr
e
ttify -D_FORTIFY_SOURCE workaround"
commit
|
commitdiff
|
tree
2011-04-15
S
ebastian Schuberth
doc:
C
larify that "cherry-p
i
c
k
-x" does not use "
g
it
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-15
Jonathan Nie
d
er
D
o
cumentation: publicize hint
s
f
o
r sending patch
e
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-15
J
o
n
a
t
han
N
i
eder
Docume
n
tat
i
on: publi
c
ize KMail hints fo
r
s
end
i
ng
patches
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-15
J
onathan Nieder
Docum
e
nt
a
t
i
on: hints for se
n
d
ing patch
e
s
i
nline with
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-15
J
on
a
than Nied
e
r
D
o
cumentatio
n
:
e
xplain ho
w
t
o check for patch co
r
ruption
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-15
J
u
nio C Ham
a
no
Merge
v
1
.
7
.
5
-
rc2
i
nto
jn
/
format-patch-doc
commit
|
commitdiff
|
tree
2011-04-15
Jonathan Nieder
Docume
n
tation:
describe
the format
o
f messages
w
it
h
.
.
.
Improved-by: Junio C Hamano <
gitster@pobox.com
>
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-15
Jonathan Ni
e
der
R
estructure documentatio
n
for
git-merge-ba
s
e
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-15
Vincent v
a
n
Ravestei
j
n
Documentatio
n
: update to git-
m
erg
e
-base
-
-
octopus
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
Junio C Hamano
i1
8
n
:
use test_i
1
8n{cm
p
,grep} in
t7600
,
t7607, t
7
611
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
J
u
n
io C Ham
a
no
i18n: use test_i18n{gr
e
p,cmp} in t7508
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
Junio
C
Hamano
i18n: u
s
e tes
t
_i18n
g
r
e
p
in
t7506
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
Junio C Hamano
Merge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2011-04-14
René Sch
a
rfe
archive: d
o
cumen
t
limitatio
n
of ta
r
.
umask co
n
fig setti
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
Micha
e
l J
G
ruber
t
330
6
,t5304: avoid clock skew i
s
sue
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-14
M
i
chael
J G
r
uber
git
.
t
x
t
: f
i
x list continuation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Junio
C
Hamano
i18n: use test_i1
8
n
g
r
ep
and t
e
st
_
i
18ncmp in
t
7
5
0
2
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
J
unio C Hamano
i18n: u
s
e
t
est
_
i
18ngrep in t7501
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2011-04-13
Junio C Ha
m
ano
i
18n: use test_i18
n
cmp in t7500
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next