repo.or.cz
/
git
/
trast.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
Johannes Sixt
r
e
ba
s
e -i -p: Fi
x
--c
o
nt
i
nue a
f
t
e
r a
m
e
rge could
n
ot
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-21
Jo
h
annes Sixt
Show a fa
i
lure of rebase -p i
f
the merge h
a
d a conflict
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Mark
u
s Heidelbe
r
g
Documentation
:
fix typos, grammar, ascii
d
oc s
y
ntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
J
unio C Haman
o
Merge branch 'maint' t
o
sync with GIT 1
.
6
.
0
.
6
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
J
u
n
i
o
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
a
n
o
fast
-
impo
r
t: make ta
g
g
e
r information opti
o
nal
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Johannes S
c
hindelin
fast-expo
r
t: deal wi
t
h tag objects that do not ha
v
e
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
M
iklos V
a
jna
SubmittingPatches: mention
the usage
of
r
e
a
l name in
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
D
avid A
g
uil
a
r
git-merge
t
ool: prope
r
ly handle "git mer
g
et
o
o
l
-- filename"
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Wu Fengguan
g
git-send
-
email: ha
n
dl
e
e
m
ail address with quo
t
ed
comma
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-20
Markus Heidelbe
r
g
Documen
t
ati
o
n: fix typos, grammar, asci
i
do
c
syntax
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-19
Markus Heidelb
e
rg
Documentat
i
on: sync exampl
e
output wit
h
git output
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
René Sch
a
r
fe
Fix
t
ype-mi
s
mat
c
h compiler
warning from diff_
p
opulate_
f
ilespec(
)
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
Michael
J
Gruber
t
e
s
t overlapping ignore patterns
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
Junio C Ham
a
no
M
e
r
g
e
branch
'lt/readlink'
commit
|
commitdiff
|
tree
2008-12-18
Arjen Laarho
v
en
Enable
threaded delta sea
r
ch on Mac
O
S
X
/Da
r
wi
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
Na
n
ako Shiraishi
Clar
i
fy document
a
tion of "git checkou
t
<tree-i
s
h> p
a
ths
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-18
Junio C Hamano
Mer
g
e
g
i
t://repo
.
or
.
c
z
/
gi
t
-gui
commit
|
commitdiff
|
tree
2008-12-17
Mikl
o
s V
a
jna
githooks document
a
tion: add a note about the +x
m
ode
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
J
u
nio C Hamano
c
ombine
-
diff
.
c: use
s
trbu
f
_readl
i
nk()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Juni
o
C Hamano
bu
i
lti
n
-b
l
ame
.
c: use s
t
rbuf_
r
eadlin
k
()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Juni
o
C Hamano
m
a
ke_a
b
solute_
p
ath(): check bounds when see
i
ng
an overl
o
n
g
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Linus Torvalds
Make 'prepare_temp_file()'
i
gnore st_size for s
y
m
l
inks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Linu
s
Torvalds
Make 'diff_popula
t
e
_
f
ilespec()'
use the n
e
w 's
t
rbuf_r
e
adlink()'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Lin
u
s Torva
l
d
s
Mak
e
'in
d
ex_pa
t
h()' use '
s
trbuf_readlink()'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Linus Torval
d
s
M
ake 'ce_compare_link()' use the new 'strbuf_
r
eadlink(
)
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
L
i
nus To
r
valds
Add generic '
s
trbuf_readlink()' helper fu
n
ctio
n
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Ma
r
k
us Heidelberg
doc/
g
i
t-rese
t
:
a
dd reference to git-stash
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Marku
s
Heidelberg
Documen
t
ation:
f
ix de
s
cription for enabling hooks
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Miklos
Vajna
git-daemon docu
m
en
t
ation
:
u
s
e
{tilde}
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
J
unio C Ha
m
ano
gitweb:
d
o
not r
u
n "git diff"
t
hat
i
s Porce
l
ain
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Ham
a
no
GIT 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 Ham
a
no
GIT 1
.
5
.
4
.
7
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Hamano
gitweb
:
do no
t
run "git
d
iff"
that is Porcelain
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-16
Lee M
a
rlow
b
ash co
m
pletion: S
y
n
c
co
n
fig vari
a
bles with their m
a
n
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-16
Lee Mar
l
ow
b
a
sh completion: Sort conf
i
g completion variables
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-16
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-12-16
Johannes
Schindelin
f
as
t
-import: clo
s
e
pack before unlinking it
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
Junio C
H
a
mano
p
a
ger: do not dup2 stderr if
i
t
i
s
already redirecte
d
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
Junio C Hamano
g
i
t-show
:
do not segfault wh
e
n showing
a bad tag
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
J
ohannes Sch
i
n
delin
Get rid of the last remnants of G
I
T_CONFIG_LOC
A
L
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
Al
e
xander Gavrilov
Document
a
tion: D
e
scribe git-gui Tools menu co
n
fig
u
ration
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-15
YONETANI
Tomokazu
git-
f
a
s
t-
i
m
p
o
rt possible memory corrupt
i
on probl
e
m
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-13
Markus
H
eidelb
e
rg
b
uiltin-c
o
mmit: remove unused message var
i
able
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-13
Junio C Hamano
Merg
e
branc
h
'm
a
int'
commit
|
commitdiff
|
tree
2008-12-13
Brandon
C
asey
git-bran
c
h: display sha1 o
n
branch deletion
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-13
Jim Meyering
git-config
.
t
xt: fix a typo
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-11
Junio
C
Ham
a
n
o
M
erge branch 'maint
'
commit
|
commitdiff
|
tree
2008-12-11
Linus Tor
v
alds
fs
c
k: reduce s
t
a
c
k
footprin
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-11
Je
f
f
K
ing
rebase: improve
e
rror mes
s
ages abo
u
t di
r
ty stat
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-11
Nicola
s
P
i
tre
make sure packs to be
replaced
a
re c
l
o
sed beforehand
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Alexander Po
t
ashev
Fix
typo in com
m
ent in built
i
n-add
.
c
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Jun
i
o C H
a
mano
Fix t4031
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Junio
C
Hamano
M
erge bran
c
h
'
maint'
commit
|
commitdiff
|
tree
2008-12-10
J
e
ff King
diff
:
respec
t
text
c
onv
in rewrit
e
di
f
fs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
J
e
ff King
diff: fix handling of b
i
nary rewrite diffs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Alexa
n
de
r
P
o
tashev
Fix
typ
o
s
i
n docum
e
ntation
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Tor Arvid Lund
git-p4:
Fix regre
s
sion in p4Where method
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Ralf Wildenhues
Impr
o
ve lang
u
age
i
n git-merge
.
txt and rela
t
ed docs
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-10
Junio C
H
amano
work a
r
ou
n
d Pyth
o
n warni
n
gs from AsciiDoc
Signed-off-by:
Junio C Hamano
<junio@pobox.com>
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-09
Alexey Borze
n
k
ov
Define link
g
it
macro
in
[
macros] section
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-09
De
s
kin Mill
e
r
git-s
v
n: Make following
p
arent
s
atomic
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Jakub Narebski
g
i
t
web: Fix bug in inser
t
_fi
l
e() sub
r
outine
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Jeff
K
ing
diff: allow turn
i
n
g
o
n
textc
o
nv explicitly for plumbing
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Jeff King
r
eorder
A
LLOW_TEXTCON
V
o
p
ti
o
n sett
i
ng
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Junio C Ha
m
ano
read-cache
.
c
: typofix in comment
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Ju
n
io C Hamano
builti
n
-checkout
.
c:
chec
k
error re
t
urn from read_cache()
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Junio C Hamano
P
oint "
s
tale" 1
.
6
.
0
.
5 documentation
from the
main git
.
.
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-08
Junio
C Ha
m
ano
R
e
vert "g
i
t-sta
s
h
:
u
s
e
git
rev-parse -
q
"
commit
|
commitdiff
|
tree
2008-12-07
J
u
nio C Hamano
Update dr
a
ft r
e
lease n
o
t
es for 1
.
6
.
1
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
Junio C Haman
o
Merge branch 'maint
'
commit
|
commitdiff
|
tree
2008-12-07
Jun
i
o
C
H
ama
n
o
GI
T
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 n
o
t reverse or
d
er of arguments
commit
|
commitdiff
|
tree
2008-12-07
Jeff King
tag
:
delete TAG_EDITMSG
o
nly on
s
u
c
c
e
ssful
t
a
g
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
Jaku
b
Narebsk
i
gitweb: Make proje
c
t
spe
c
ific override
f
or
'grep' 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
_
c
onfig_string' to ge
t
'curl_h
t
tp_prox
y
'
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-07
Thom
a
s
R
a
s
t
f
e
tch-p
a
ck: Avoid me
m
cpy() with src==d
s
t
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-06
Juni
o
C Hamano
Update
d
ra
f
t relea
s
e 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 'jc/am-options'
commit
|
commitdiff
|
tree
2008-12-06
J
u
nio
C
Hama
n
o
git-am: rename
a
p
pl
y
_op
t
_e
x
tra file to apply-opt
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Junio C Hamano
T
e
st that g
i
t
-
am does not l
o
se -C/
-
p/--whitespace options
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
J
unio C H
a
mano
git-a
m
: propagate --3way
options as well
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
J
unio C Ham
a
no
g
it-a
m
:
propaga
t
e
-
C
<n>, -p<n> opti
o
ns as well
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Junio C Hamano
git-am
--
w
h
i
tespa
c
e:
do
not lo
s
e the command line option
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Tor
A
rvid Lund
git-
p
4: Fix bug
in
p
4Wh
e
re
method
.
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Alex Riesen
Repo
r
t sym
l
ink
failure
s
in merg
e
-r
e
curs
i
ve
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-05
Alex Rie
s
en
Make chdir fai
l
ures 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 fwr
i
te/fclose/write/close failures visibl
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-04
Junio C H
a
mano
Merge branch
'
dm/svn
-
remote'
commit
|
commitdiff
|
tree
2008-12-04
J
u
nio C Hamano
Merge branch 'jn/gitweb-utf8
'
commit
|
commitdiff
|
tree
2008-12-04
Jeff K
i
ng
add
stage t
o
git
i
gnor
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
Miklo
s
Vajna
submodule: use git rev-parse
-
q
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
Miklos V
a
jna
reb
a
se
:
us
e
git
rev-parse -
q
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
pull: use git rev-
p
arse -q
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
lost-found: u
s
e
g
it rev-parse -q
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
Miklos
V
aj
n
a
filter-branch: use git rev-parse -q
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
Deskin Miller
g
it-svn:
M
a
k
e
b
ranch us
e
correct svn
-
r
e
mo
t
e
Signed-off-by:
Junio C Hamano
<gitster@pobox.com>
commit
|
commitdiff
|
tree
2008-12-03
Juni
o
C Haman
o
Me
r
ge branch 'jc/rm-i-t-a'
commit
|
commitdiff
|
tree
2008-12-03
Ju
n
i
o C Hamano
Merge
branc
h
'mai
n
t'
commit
|
commitdiff
|
tree
next