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
rebase -i -p: Fix --continue after a merge could not be redone
2008-12-21
Johan
n
es Si
x
t
r
e
base
-
i -p: Fix
-
-continue
a
fter a mer
g
e c
o
u
ld not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
Johannes Six
t
Show a fail
u
re of rebase -
p
if the mer
g
e ha
d
a conflict
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
M
a
rk
u
s
H
eidelberg
D
o
cumentation: fi
x
typos,
grammar, asciidoc synt
a
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Junio C
Hamano
Me
r
ge b
r
an
c
h
'
maint' to sync with GIT 1
.
6
.
0
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
J
unio C Hamano
GIT
1
.
6
.
0
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
J
u
nio C Haman
o
fast-import: make tagger information option
a
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Joha
n
ne
s
Schindelin
fa
s
t-export:
d
e
al
w
i
t
h ta
g
obje
c
t
s that
d
o not h
a
ve
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Miklos Vajn
a
S
u
bmittingPatches: me
n
tion the usage o
f
rea
l
na
m
e in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
David Ag
u
il
a
r
git-me
r
getool: properly handle "git mergeto
o
l --
f
ilename"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Wu Fenggu
a
ng
git-sen
d
-email: handle email
address with
q
u
oted co
m
ma
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Markus He
i
delber
g
Documenta
t
i
o
n: fix typos, gra
m
mar, a
s
c
i
idoc s
y
ntax
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-19
M
arkus Heidelberg
Documentation: sync example output with g
i
t output
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
René Sc
h
arfe
Fix typ
e
-mismatch co
m
pile
r
warning
fr
o
m dif
f
_populate_filespec()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
Michael J Gruber
tes
t
overlapping ignore patterns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
Junio C Hamano
Merge b
r
anch 'lt/rea
d
link'
commit
|
commitdiff
|
tree
2008-12-18
Arj
e
n
Laarhoven
Enable threaded
d
elta search on
Mac OS X/D
a
r
win
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
Nanako Shi
r
aishi
Clarify documentation of
"
git checkout <tr
e
e
-
ish> path
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
J
u
nio C Hamano
Merge g
i
t
:
/
/
repo
.
or
.
cz/git-g
u
i
commit
|
commitdiff
|
tree
2008-12-17
Miklos V
a
jna
g
ithooks
d
ocumentati
o
n: add a note about the +x mo
d
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio
C Hamano
combi
n
e-di
f
f
.
c: use
s
trbuf_read
l
ink(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio
C
H
amano
bu
i
ltin-blame
.
c: use strbuf_readlink
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio C H
a
mano
mak
e
_absolu
t
e
_path()
:
check bounds whe
n
seein
g
an
o
ver
l
ong
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Linus
To
r
valds
Ma
k
e 'prep
a
re_temp_fi
l
e(
)
' ignore st_size for
s
ymlink
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Linus Tor
v
alds
Make
'diff_
p
opulate_
f
ilespec()' u
s
e the
n
ew 'strbuf_readlink()'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Linus Torvalds
Ma
k
e 'index_pat
h
(
)
'
u
se 'strbuf_read
l
ink()'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Linus Torvalds
M
a
ke 'ce_compare_link()' use the new 'st
r
buf_readlink()'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Linus
Torvalds
Ad
d
generic
'
strbuf_re
a
dli
n
k()' helper func
t
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Ma
r
kus Heid
e
lberg
doc/git-reset: add reference
to
git-sta
s
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Marku
s
Heidelberg
D
o
cume
n
tation: fix descript
i
on for enabling hoo
k
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
M
i
k
los Vajna
git-daemon documentation: use {tild
e
}
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio
C
Hamano
g
i
tweb: do not run "git diff" th
a
t is
Porcelain
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio
C
Ham
a
n
o
GIT 1
.
5
.
6
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Haman
o
GI
T
1
.
5
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Ha
m
a
no
G
I
T 1
.
5
.
4
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Hamano
gi
t
w
e
b:
d
o
n
ot run
"git diff" that is Porcelain
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-16
Lee Marlow
bas
h
completion: Sync c
o
nfig va
r
iables wit
h
th
e
ir man
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-16
Lee Ma
r
low
bash completion: So
r
t co
n
fig comp
l
et
i
on variables
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-16
Junio C Ham
a
n
o
Me
r
ge
branch 'm
a
i
nt'
commit
|
commitdiff
|
tree
2008-12-16
Jo
h
annes S
c
h
i
ndelin
fast-import: close
pa
c
k bef
o
re
unlinking it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
J
u
nio C Hamano
pager
:
do not
dup2 stderr
i
f it is
a
lready redirected
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
Junio C
Hamano
git-show:
d
o not segfault when showing a bad tag
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
Johannes Schindeli
n
G
et ri
d
of
t
he last r
e
mna
n
ts of
G
IT_C
O
N
FIG_LOCAL
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
A
l
exande
r
Gavrilov
Documenta
t
ion: Describe git-gui Tools menu configuration
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
YONETANI Tomok
a
zu
git
-
fa
s
t
-i
m
port
p
ossible memo
r
y corruption pr
o
blem
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-13
Mar
k
us Heide
l
berg
bui
l
tin-com
m
it:
r
emo
v
e
unused me
s
sage varia
b
le
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-13
Junio C H
a
man
o
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-12-13
Brandon
C
asey
g
it-branch: display sha1 on
branch d
e
l
e
ti
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-13
Jim Meyering
git-c
o
nfi
g
.
txt: fix a
t
yp
o
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-11
J
unio
C
Hamano
Merge br
a
n
ch 'maint'
commit
|
commitdiff
|
tree
2008-12-11
Linus To
r
vald
s
fsck: reduce sta
c
k
footprint
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-11
J
e
ff King
rebase: i
m
prove e
r
ror messag
e
s about dirty
s
tate
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-11
Nico
l
as Pitr
e
make sure
p
acks to b
e
replaced are closed beforehand
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Alexand
e
r
P
otas
h
ev
Fix
t
ypo in
c
omment in builtin-ad
d
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
J
u
ni
o
C Hamano
Fi
x
t4031
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
J
u
nio C Hamano
Me
r
ge
b
ranch 'm
a
int'
commit
|
commitdiff
|
tree
2008-12-10
Jeff
Ki
n
g
d
i
ff: respect textconv i
n
rewri
t
e
dif
f
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Jeff Kin
g
diff: fix handl
i
n
g
of bi
n
ary
rewrite diffs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Al
e
xa
n
der Potashev
Fi
x
typos
in doc
u
mentation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
T
or
A
rvi
d
Lund
g
i
t
-
p4:
Fix reg
r
ess
i
o
n
in p4Where method
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Ralf Wild
e
nhues
I
m
p
rove
langua
g
e in gi
t
-merg
e
.
txt and relate
d
d
o
cs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Junio C
H
amano
wo
r
k around
P
yt
h
on
w
a
r
n
ings fro
m
Ascii
D
oc
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-09
Alexey Borzenkov
D
e
fine linkgi
t
macro in [macros] sec
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-09
D
e
skin Mi
l
ler
g
i
t
-svn: Mak
e
following par
e
n
t
s atomic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Jakub Narebski
gitwe
b
: Fi
x
bug in inser
t
_file() subroutine
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Jeff King
diff: allow turning
o
n textconv explicitly for plu
m
bing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
J
eff King
r
e
o
r
de
r
AL
L
OW_TEXTCONV o
p
ti
o
n s
e
tting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
J
u
nio C Hamano
r
ead-c
a
che
.
c
: typofix i
n
comment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Junio C
Hamano
builtin
-
checkout
.
c
:
c
heck
e
rr
o
r ret
u
rn from read
_
cach
e
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Junio
C
Ha
m
an
o
P
oi
n
t "stale" 1
.
6
.
0
.
5 d
o
c
u
ment
a
tion from the main
g
i
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Jun
i
o C
Ham
a
n
o
Revert "git-stash
:
use gi
t
r
ev-
p
arse -q"
commit
|
commitdiff
|
tree
2008-12-07
Junio C Hamano
Update
draft release n
o
t
es for 1
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
J
unio C Ham
a
no
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2008-12-07
Junio C
H
am
a
no
GIT 1
.
6
.
0
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Matt
M
c
Cutchen
"git diff <tree>{3,}": do not rever
s
e order of argum
e
nts
commit
|
commitdiff
|
tree
2008-12-07
Jeff King
tag: del
e
te TA
G
_EDITM
S
G only on succes
s
ful
t
ag
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
J
akub Narebsk
i
gitw
e
b: Make
p
roj
e
ct specif
i
c override for 'gre
p
' feature
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Miklo
s
Va
j
na
http
.
c: use 'g
i
t_
c
on
f
ig_string'
to ge
t
'curl_http_proxy'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Thomas Rast
fetch
-
pack: A
v
oid m
e
mcpy() with src
=
=dst
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-06
J
u
nio C
H
ama
n
o
Upd
a
t
e
draft release notes
t
o 1
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-06
Ju
n
io
C
H
a
mano
Merge
b
r
a
nch 'jc/a
m
-
o
ptions'
commit
|
commitdiff
|
tree
2008-12-06
Ju
n
io C Hamano
git-am:
r
e
na
m
e apply_opt_extra fil
e
to apply-opt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
J
u
nio C Hamano
Test that git-
a
m does no
t
lose -C/-p/
-
-whitespac
e
options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Junio
C
H
amano
git-am: pro
p
agate --3wa
y
op
t
ions as w
e
ll
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
J
unio
C
Hamano
git-am:
p
ropagat
e
-C<n
>
, -p<n>
o
ptio
n
s
as well
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Junio C
Ha
m
ano
g
it-am --whitespace:
do not lose t
h
e
c
omm
a
nd lin
e
option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Tor Arvid Lund
git-p4: Fix bug i
n
p4Where met
h
od
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Alex Riesen
R
eport syml
i
n
k
failures in
merg
e
-recursive
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Alex Riesen
Make chdir failures visible
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
A
lex
Ri
e
sen
Make some of
f
write/fclos
e
/write/close fai
l
ures visible
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-04
Junio C Hamano
Merge b
r
anch 'dm/s
v
n
-remote'
commit
|
commitdiff
|
tree
2008-12-04
Ju
n
io C Hamano
Mer
g
e
bran
c
h
'
j
n/gitweb-utf8'
commit
|
commitdiff
|
tree
2008-12-04
Jeff King
add stage to gitignore
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Miklo
s
Vajna
submod
u
le: use
g
it rev-par
s
e -q
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
M
iklo
s
Vajna
r
e
base: use git rev-parse -q
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Mi
k
los Vajna
pull: use git
r
ev-parse
-
q
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
lost-found: use git rev-parse
-q
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
f
i
l
ter-branch: use g
i
t
r
ev-parse -
q
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Deski
n
Miller
g
i
t-sv
n
: Make branch use correct svn
-
remote
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Junio C Ham
a
no
M
e
rge branch
'
jc/rm-i-t-a'
commit
|
commitdiff
|
tree
2008-12-03
J
u
nio
C Hamano
Merge
b
r
a
nch 'maint'
commit
|
commitdiff
|
tree
next