repo.or.cz
/
git
/
dscho.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 failur
e
of
r
ebase -p if the merge
had a conflict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Ma
r
kus Heidelbe
r
g
Documenta
t
ion:
fix typos, grammar, asciid
o
c
syntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Jun
i
o C Ha
m
ano
M
erge branch 'maint'
to syn
c
w
ith GIT 1
.
6
.
0
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Junio C Hama
n
o
GIT 1
.
6
.
0
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Jun
i
o C Ha
m
ano
fast
-
import: mak
e
tagger infor
m
ation
o
ptional
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
J
ohannes Schinde
l
i
n
fast-exp
o
r
t: deal wit
h
tag object
s
tha
t
do no
t
ha
v
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Miklos
Vajna
Submit
t
ingPatches: mention the usage of
rea
l
n
ame in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
D
a
v
id Aguilar
git-m
e
rgetoo
l
: properly handle "git mergetool -- filename
"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Wu Fengguang
git-send-email: handle email address with quoted comma
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Marku
s
Heidelberg
Docum
e
ntatio
n
: f
i
x typos, grammar, asciidoc syntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-19
Markus
H
eide
l
b
e
rg
Documentati
o
n: syn
c
exa
m
p
le outp
u
t wi
t
h git o
u
tpu
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
René Scharfe
Fix t
y
pe
-
mismatch
compile
r
warning from diff_populate
_
fi
l
e
spec()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
Michael J Gruber
test overlapping
i
gnore p
a
tte
r
ns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
Ju
n
io C Ham
a
no
Merge branch 'lt/r
e
adlink'
commit
|
commitdiff
|
tree
2008-12-18
Arjen Laarhoven
Enable threaded de
l
t
a
sea
r
ch on
M
ac
O
S X/Darwin
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
N
a
n
ako Shiraishi
Clar
i
f
y
d
ocumentat
i
on of "g
i
t checkout <tree-ish> pa
t
hs
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
Junio C Hamano
Merge git:/
/
repo
.
or
.
cz/git
-
gui
commit
|
commitdiff
|
tree
2008-12-17
Miklos Vajna
git
h
ooks do
c
umentation: add a not
e
abou
t
the +x mode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Juni
o
C Ham
a
n
o
comb
i
ne
-
diff
.
c: u
s
e strbuf_readlink()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Hama
n
o
builti
n
-blame
.
c: use strbuf_
r
e
a
dlink()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Ham
a
n
o
make_abs
o
lute_
p
ath(): check bound
s
when
seeing an
over
l
ong
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Linus T
o
rvalds
Make
'
pr
e
pare_temp_f
i
le()' ignore st_size for
s
ymlinks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Li
n
us
Torvalds
Make 'di
f
f_populate_
f
i
lespec()' use the new 'strbuf_readlink()'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Linus To
r
v
alds
Make 'index_path()' use
'
strbuf_readl
i
nk()'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
L
inus T
o
rvalds
M
ake '
c
e_compare_li
n
k(
)
'
use the new 'strbuf_readlink()'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
L
i
n
u
s
Torvalds
Add ge
n
eric 'strbuf_readlink()' hel
p
er function
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Marku
s
Heidelberg
doc/git-rese
t
:
add
reference t
o
git-stas
h
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Mark
u
s
Hei
d
elb
e
rg
Documen
t
ation: fix descri
p
t
ion for e
n
abling hooks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Mik
l
os Vajn
a
g
i
t-daemon documentation: use {tilde}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
J
u
nio C Hamano
gi
t
web: do not run "git dif
f
"
t
hat is Porc
e
la
i
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Jun
i
o C Ha
m
ano
GIT 1
.
5
.
6
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Hama
n
o
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
Junio C Hamano
git
w
eb: do
not
run "git diff" that i
s
Porcel
a
in
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-16
Lee
M
a
r
l
ow
bash
comp
l
etio
n
: Sync config var
i
ab
l
es w
i
th the
i
r
man
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-16
Lee
Ma
r
low
bash complet
i
on:
S
or
t
config completion v
a
riables
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-16
Junio C Hamano
M
e
rge branch
'
maint'
commit
|
commitdiff
|
tree
2008-12-16
Johannes Schindelin
fast-i
m
port: close pack
before un
l
inking i
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
J
u
nio C Ham
a
no
p
a
ge
r
: do not dup2 stderr if it
i
s alread
y
redirected
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
Junio C Hamano
git-show: do not segfaul
t
when showing a bad ta
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
Johan
n
es
S
chindelin
Get rid of the las
t
r
e
mnants
o
f GIT_CONFIG
_
LOCAL
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
Alexander Gavrilov
Documentation: Describe gi
t
-
gu
i
Tools menu configuration
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
YONETANI Tomokazu
git-fast-
i
mport
pos
s
ible me
m
o
r
y
corruption problem
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-13
Mark
u
s Heidelberg
b
u
i
l
t
in-commit: remove
u
nu
s
ed messag
e
var
i
a
b
le
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-13
Ju
n
io C Ham
a
no
Mer
g
e
bra
n
ch 'maint'
commit
|
commitdiff
|
tree
2008-12-13
Br
a
ndon
C
asey
g
it
-
b
ranch:
d
isp
l
ay sha1 o
n
branch deleti
o
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-13
Jim Meyering
git
-
config
.
txt:
f
ix a typo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-11
Junio C Haman
o
M
erge branch
'maint'
commit
|
commitdiff
|
tree
2008-12-11
Linus Torvalds
fsck: red
u
c
e
stack
footp
r
int
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-11
Jeff King
rebase: improve error messages about d
i
rty state
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-11
Nicolas Pitre
m
a
ke sure packs
t
o be replace
d
are clos
e
d beforehand
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Alexander Potashev
Fix typo in c
o
m
ment in
built
i
n-ad
d
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Junio C Ham
a
no
Fix t4031
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Junio C
Hamano
Merge b
r
anch 'maint'
commit
|
commitdiff
|
tree
2008-12-10
J
e
f
f
King
diff: respec
t
textconv in rewri
t
e
d
i
ffs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Jeff K
i
ng
dif
f
: fi
x
h
andling of
b
inary rewrite diffs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
A
lexand
e
r Potashev
Fix
typos in document
a
tion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Tor Arvid Lun
d
git-p4: Fix regression in p4Wh
e
re method
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
R
a
l
f
W
i
l
d
enhue
s
Imp
r
ove lan
g
uage in git
-
merge
.
txt and relate
d
doc
s
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Junio C Ha
m
a
n
o
work around P
y
thon warnings from Asci
i
D
o
c
Signed-off-by:
Junio C Hamano
<junio@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-09
A
l
e
x
ey Borzenkov
Def
i
ne
l
in
k
git
macro in [macros]
section
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-09
De
s
kin M
i
ller
git-svn:
M
ake following parents
atomi
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Jak
u
b
Narebski
git
w
eb:
F
ix bug in in
s
ert_file() s
u
b
r
outin
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Jeff King
diff: allow turning on textconv explic
i
tly fo
r
plumbing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Jeff King
re
o
rder A
L
LOW_TEXTCONV o
p
t
ion
setting
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Junio C
Ham
a
no
rea
d
-cache
.
c: typofix in co
m
ment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Juni
o
C Hamano
builtin-checkout
.
c: check error
r
e
turn from rea
d
_cache()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Juni
o
C
Hamano
Point "stale" 1
.
6
.
0
.
5
docu
m
entation
f
rom the main git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Junio C Hamano
Revert "git
-
st
a
sh: use git rev-parse -
q
"
commit
|
commitdiff
|
tree
2008-12-07
J
u
ni
o
C
H
amano
Update draft release notes for 1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
Juni
o
C Hamano
M
e
rge
br
a
nch 'maint'
commit
|
commitdiff
|
tree
2008-12-07
Junio C
Hamano
G
I
T
1
.
6
.
0
.
5
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
Matt McCutchen
"git diff <t
r
e
e>
{
3,
}
"
: d
o
not reverse orde
r
of a
r
guments
commit
|
commitdiff
|
tree
2008-12-07
Jeff King
tag
:
delete TAG_EDITMSG only on suc
c
e
s
sful tag
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
Jakub Narebski
gitweb: Make projec
t
specific ov
e
r
r
ide for 'grep' featur
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
Miklos
Vajn
a
http
.
c: us
e
'git_co
n
fig_s
t
r
ing
'
to get 'curl_
h
tt
p
_pr
o
xy
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
Thoma
s
Ras
t
fetch-pack: Avoid memcpy() with src==dst
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-06
Junio
C Hamano
Update draft
release
notes to 1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-06
Junio C Hamano
Merge branch '
j
c/am-options'
commit
|
commitdiff
|
tree
2008-12-06
J
unio C H
a
mano
gi
t
-am: ren
a
me
a
p
ply_o
p
t
_extra
f
i
le to
a
p
ply-op
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Junio C
H
a
mano
T
e
s
t that
g
it
-
am does
not lose
-C/-p/--whitespa
c
e op
t
ions
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Jun
i
o C
H
ama
n
o
git-am:
p
ropagate --3way options as wel
l
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Juni
o
C Hamano
git-a
m
:
p
rop
a
gate
-
C<n>, -p
<
n> opti
o
ns as
w
ell
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Juni
o
C
Hamano
git-
a
m
--whit
e
s
pace
:
do
not lo
s
e the
command l
i
ne o
p
tio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Tor Ar
v
id Lund
git-p4: Fix bug in p4Where method
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Alex Riesen
Report symlink
failures in merg
e
-
r
ec
u
rsi
v
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Alex Riesen
Make ch
d
ir failur
e
s
visible
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Alex
R
iesen
Make s
o
m
e
o
f
f
w
rite/fclo
s
e/write/close failures visib
l
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-04
Junio C Hamano
Mer
g
e
b
ranch '
d
m/svn-remote'
commit
|
commitdiff
|
tree
2008-12-04
Junio C Hamano
Merge branch 'jn/gitwe
b
-utf8'
commit
|
commitdiff
|
tree
2008-12-04
J
e
ff King
ad
d
s
t
ag
e
to giti
g
nore
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
Miklo
s
Vajna
subm
o
dul
e
: use git rev-pars
e
-
q
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
Mik
l
os Vajna
rebase: use g
i
t rev-p
a
rse
-q
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
Mik
l
os Vajna
p
u
ll:
u
se git
r
ev-parse -q
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
Mi
k
los Vajn
a
lost-fo
u
nd: us
e
git r
e
v-parse -q
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
Miklo
s
Vajna
filter-branch: use git rev-parse -q
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
Deskin Miller
git-s
v
n: Make
b
ra
n
c
h
use
corr
e
ct svn-remote
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
Ju
n
io C
H
a
m
a
no
Merge branc
h
'jc/rm-
i
-t-a'
commit
|
commitdiff
|
tree
2008-12-03
J
u
nio
C Ha
m
ano
Me
r
ge
b
ran
c
h 'maint'
commit
|
commitdiff
|
tree
2008-12-03
Jun
i
o C H
a
m
a
no
Install git-st
a
ge in exec-
p
ath
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
next