repo.or.cz
/
git
/
dkf.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Show a failure of rebase -p if the merge had a conflict
2008-12-21
Johannes
Sixt
Show a failure of rebas
e
-
p if the merge had a
conflict
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Markus Heidel
b
erg
Documen
t
ation:
f
ix typos, grammar, as
c
ii
d
oc synt
a
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Junio
C
Ham
a
no
Merge bra
n
ch 'maint' to sync with
G
I
T
1
.
6
.
0
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Junio C Hamano
GIT
1
.
6
.
0
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Junio C Ha
m
ano
fast-import: m
a
ke tagger i
n
form
a
tion optional
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Johannes Sc
h
indeli
n
fast-export: deal with
tag ob
j
ec
t
s that
do no
t
have
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
M
iklos Va
j
na
Submi
t
t
i
ngPatches: m
e
nti
o
n the usage
o
f
r
eal name in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Dav
i
d
Aguilar
git-mergetool:
properly
handle
"git
mergetool -- fi
l
ename"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
W
u
F
e
ngguang
git-send-email: handle email
a
ddress wi
t
h quoted
c
omma
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Markus Heidelberg
Documentation: fix typo
s
, grammar, asciidoc synt
a
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-19
Markus
Heide
l
berg
Docum
e
ntatio
n
: sy
n
c example
o
ut
p
ut with git outpu
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
René Scharfe
Fix
t
y
p
e-mismatch compiler warni
n
g
f
rom diff_popu
l
ate_filespec(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
M
i
chael
J
Gr
u
ber
test ov
e
rlapping ignor
e
p
a
t
tern
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
J
u
nio C
Hamano
Merge branch 'lt/r
e
adlink'
commit
|
commitdiff
|
tree
2008-12-18
Ar
j
en
L
aarhoven
Enabl
e
t
h
r
e
a
ded
delta
s
earch o
n
Mac
O
S
X
/
Darwin
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
Na
n
ako Shir
a
i
shi
C
l
ari
f
y
documentation of "git chec
k
out <tree-ish> p
a
ths
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
Junio C Ha
m
ano
Merge
git://
r
epo
.
or
.
cz/git-g
u
i
commit
|
commitdiff
|
tree
2008-12-17
Miklos V
a
jna
githooks
d
ocumenta
t
i
on: a
d
d a not
e
ab
o
u
t
the +x mode
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Hamano
combine-diff
.
c: use strbuf_readlink(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Ha
m
a
n
o
builti
n
-blame
.
c: use strbuf
_
readlink()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Hamano
m
ake_absolute_p
a
th(): check b
o
unds w
h
en s
e
eing
a
n overlong
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
L
inus Torv
a
lds
Make 'prepare_
t
emp_file()
'
ignore st_size
f
or s
y
m
l
inks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
L
i
nus
T
orvald
s
Make 'diff_popu
l
at
e
_filespec()'
u
s
e
t
h
e
n
ew
'
s
t
rbuf_read
l
i
n
k()'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
L
inus Torva
l
d
s
Mak
e
'
i
n
dex_p
a
th()' use 's
t
rbuf
_
rea
d
link()'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Lin
u
s Torvalds
Make
'
ce_c
o
m
pare_link
(
)
' u
s
e the n
e
w 'strb
u
f_readlink()'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
L
i
n
u
s
Torvalds
Add generic 'strb
u
f_read
l
i
n
k()' hel
p
e
r
f
unction
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Marku
s
Heidelberg
doc/g
i
t
-reset: add r
e
ference to git-stash
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Markus
H
e
i
delberg
Documentat
i
on: fi
x
d
e
s
c
ription f
o
r e
n
abling hooks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Mikl
o
s Vajna
git-d
a
emon do
c
umentat
i
on:
use {tilde
}
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
J
u
nio C
H
amano
g
itweb: do not r
u
n "
g
it diff" th
a
t is Po
r
ce
l
ain
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
J
u
nio C
H
amano
G
IT 1
.
5
.
6
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Hamano
GIT 1
.
5
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio C
Hamano
G
IT 1
.
5
.
4
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
J
u
nio C Ham
a
no
g
itweb: do
not run "git d
i
ff" tha
t
i
s
Porcelain
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-16
Lee
Marl
o
w
ba
s
h comple
t
ion: Sync c
o
nfig variables with their man
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-16
Le
e
Marlow
bash
c
o
mpletion: So
r
t confi
g
completion
variables
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-16
J
u
nio C Ham
a
n
o
M
e
rge
branch 'maint
'
commit
|
commitdiff
|
tree
2008-12-16
Johannes
S
c
hi
n
de
l
in
f
ast-i
m
p
o
rt:
c
lose pack before
u
n
l
in
k
i
n
g i
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
Junio C Ham
a
no
pager: do no
t
dup2 std
e
rr if it is already redirected
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
J
u
n
io C
H
amano
gi
t
-show: d
o
not segfa
u
lt when showing a bad tag
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
Johannes Schindeli
n
Get rid of the last remnants of GIT_CONF
I
G_LOCA
L
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
Alexander Gavr
i
l
o
v
Docum
e
ntation: Describ
e
git-gui T
o
ols
m
e
nu conf
i
gu
r
ation
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
YONE
T
ANI Tomokazu
git-fast-import p
o
s
s
i
ble memor
y
corrupti
o
n problem
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-13
Markus
H
eidelber
g
bui
l
t
i
n-commit
:
remove unus
e
d message variable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-13
J
u
nio C H
a
m
ano
M
e
rge bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2008-12-13
Brandon
C
a
sey
g
i
t
-
b
ranch: display sha1
on br
a
nch del
e
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-13
Jim M
e
ye
r
ing
git-config
.
txt: fix
a typo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-11
Junio
C
Ha
m
ano
Me
r
g
e
b
r
anch 'maint'
commit
|
commitdiff
|
tree
2008-12-11
Linus To
r
valds
f
sck:
r
e
duce sta
c
k footprint
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-11
Je
f
f Kin
g
r
ebase:
i
mpr
o
ve e
r
ror
messages about
d
irty state
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-11
Nicolas
P
itre
make sur
e
p
acks to be replaced a
r
e clo
s
e
d
beforeha
n
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Ale
x
a
nde
r
Potashev
Fix
t
ypo in comment
i
n
builtin
-
add
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
J
u
nio C Ha
m
an
o
Fi
x
t4031
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Junio C Ha
m
ano
Merge
branch 'maint'
commit
|
commitdiff
|
tree
2008-12-10
Je
f
f
Ki
n
g
diff: respec
t
text
c
onv in rewrite di
f
f
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Jeff King
diff:
f
ix ha
n
d
ling of binary rewrite di
f
fs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Alexander Potash
e
v
F
i
x typos in documentation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
To
r
Arvid Lu
n
d
git
-
p4: Fix regression in p4Where m
e
thod
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Ralf Wild
e
nhues
I
mpr
o
ve language in git-merge
.
txt and
r
elated docs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Junio C Hamano
w
ork
around Python warni
n
gs from A
s
ciiDoc
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-09
Alexey B
o
rzenko
v
D
e
f
ine linkgit macro in [ma
c
ros]
secti
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-09
Deskin Mill
e
r
g
it-s
v
n
: Make f
o
llowin
g
pa
r
ents
a
t
omic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
J
a
kub Narebski
gitweb: Fix bug in insert_fi
l
e() su
b
routine
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Jeff
K
ing
diff
:
a
llow
t
urning on
t
e
xtco
n
v expli
c
itly f
o
r
plumbi
n
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Jeff Kin
g
reorder
ALLOW_TEXTCONV option setting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Junio
C
Hamano
read-cache
.
c: typofix in comment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Junio
C Ha
m
ano
built
i
n-checkout
.
c: check
err
o
r
r
eturn
f
rom read_cache()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Junio C Haman
o
Point "sta
l
e
"
1
.
6
.
0
.
5 document
a
tion from the
m
ai
n
git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Juni
o
C Ha
m
ano
R
e
vert
"
g
i
t
-sta
s
h: use g
i
t rev-parse -q"
commit
|
commitdiff
|
tree
2008-12-07
J
unio C
Ha
m
an
o
Update dra
f
t relea
s
e
notes for 1
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Jun
i
o
C Haman
o
Merge
b
ranch 'maint'
commit
|
commitdiff
|
tree
2008-12-07
Ju
n
io C Hamano
GIT
1
.
6
.
0
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Matt McCutchen
"git
d
iff
<
tr
e
e
>{3,
}
":
d
o
not revers
e
o
r
der of arguments
commit
|
commitdiff
|
tree
2008-12-07
Jeff King
tag: delete TAG_EDITMSG only
on successful tag
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Jakub
Narebski
g
i
tweb:
M
a
ke project specific overrid
e
for '
g
rep' feature
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Mikl
o
s Vajna
http
.
c: use 'g
i
t_con
f
i
g_s
t
ring
'
to get 'curl_
h
ttp_pro
x
y'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Thomas Rast
fet
c
h-pack: Avoid memcpy() with
s
rc==dst
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-06
Junio C Ha
m
ano
Update draft re
l
ease notes to
1
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-06
J
u
nio C Hamano
M
erge branch 'jc
/
am-opt
i
ons'
commit
|
commitdiff
|
tree
2008-12-06
Junio C
Hamano
git
-
am
:
r
ena
m
e apply_opt_extra file to apply-opt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Juni
o
C Hamano
Test t
h
at git-am does n
o
t lose -C/-p
/
--whitespa
c
e
o
p
tions
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Junio C H
a
mano
git-am: pr
o
p
agat
e
--3
w
ay
opti
o
ns as
w
ell
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
J
u
nio C Haman
o
git-
a
m:
p
r
o
pagate -C<n>, -p<n> options as well
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Junio C Haman
o
git-am --w
h
ite
s
pa
c
e: do not lose
the command line opti
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Tor Arvid Lu
n
d
git
-
p4: Fix b
u
g in p4
W
h
e
re method
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Alex Ri
e
sen
R
e
port symli
n
k failures i
n
merge-re
c
urs
i
ve
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Alex Riesen
Make chdir fa
i
lures visi
b
le
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Alex Riesen
M
a
ke
some of fwrite/f
c
lo
s
e/write/close failure
s
visible
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-04
J
unio C Hamano
Merge b
r
anch 'dm/svn-remote'
commit
|
commitdiff
|
tree
2008-12-04
J
u
n
io C Hama
n
o
Merge bra
n
ch 'jn/git
w
e
b-
u
t
f8'
commit
|
commitdiff
|
tree
2008-12-04
J
e
ff King
a
dd stage to g
i
tignore
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Miklos V
a
jna
submodul
e
:
use git rev-parse -q
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
M
i
klos V
a
j
na
r
e
b
ase: use git rev-parse -q
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Mi
k
los Va
j
na
pull: us
e
gi
t
rev-p
a
rse
-
q
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Miklos V
a
jna
l
ost-found: use g
i
t rev-par
s
e -q
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
filter-br
a
nch: use
g
i
t rev-pa
r
se -q
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
D
e
skin Miller
git-svn: Make branc
h
u
s
e correct sv
n
-remote
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Junio
C Hamano
Merge branch 'jc/rm-
i
-t-
a
'
commit
|
commitdiff
|
tree
2008-12-03
Jun
i
o C
H
a
ma
n
o
Merge branch
'
main
t
'
commit
|
commitdiff
|
tree
2008-12-03
Junio
C Ha
m
ano
Ins
t
all git-stage in
exe
c
-path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next