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
Merge branch 'js/maint-merge-recursive-r-d-conflict' into maint
2009-01-13
Ju
n
io C Ham
a
no
Merge
bran
c
h 'js/maint-me
r
ge-
r
e
cursi
v
e
-
r-d-conflict
.
.
.
commit
|
commitdiff
|
tree
2009-01-13
Junio
C Hamano
Mer
g
e branch 'c
b
/maint-merge-recursive-fix' into maint
commit
|
commitdiff
|
tree
2009-01-13
Jun
i
o C Ham
a
n
o
Merge branch
'
ap/mai
n
t-apply-modefix' i
n
to maint
commit
|
commitdiff
|
tree
2009-01-13
Jun
i
o C Hamano
Me
r
ge
b
ranch 'maint-1
.
6
.
0' i
n
t
o
maint
commit
|
commitdiff
|
tree
2009-01-13
P
ier
r
e Habouzit
Avoid
spurious
e
rror messages on error mi
s
takes
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-01-13
jida
n
ni@jidanni
.
org
contr
i
b
/examples/README: give
a
n explanation
o
f
the
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-01-12
J
unio C Hamano
M
erge
b
r
a
n
ch
'
mh
/
maint-sendmail-cc
-
doc' into maint
commit
|
commitdiff
|
tree
2009-01-12
Jun
i
o C
Hamano
Merge
bran
c
h 'jc/ma
i
nt-do-not-
s
witch-to-n
o
n-commi
t
.
.
.
commit
|
commitdiff
|
tree
2009-01-12
ji
d
an
n
i@jid
a
nni
.
o
rg
Documen
t
atio
n
/git-push
.
txt:
m
i
nor:
com
p
ress on
e
op
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-01-07
Junio C
H
am
a
no
M
e
rge branc
h
'maint-1
.
6
.
0' into maint
commit
|
commitdiff
|
tree
2009-01-07
Junio C Hamano
Merge branch 'maint-1
.
5
.
6' i
n
to maint-1
.
6
.
0
commit
|
commitdiff
|
tree
2009-01-07
J
oey
H
e
ss
README: tu
t
o
r
ia
l
.
tx
t
is
now called gi
t
t
u
torial
.
txt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-01-05
Henrik
Austad
Be consistent in switch usage
f
or tar
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-01-05
He
n
rik Austa
d
Use capita
l
ized n
a
me
s
w
h
e
re appropri
a
te
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-01-03
M
i
k
lo
s
Vajna
f
a
st-export: print u
s
age when no o
p
tio
n
s
s
pec
i
fied
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-01-03
Junio C Hamano
git che
c
kout:
d
o no
t
allow
s
witchi
n
g to a tr
e
e-ish
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-01-02
Junio C Haman
o
builtin-apply
:
p
r
event non-explicit perm
i
ss
i
on changes
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2009-01-01
jidanni
@
jid
a
nni
.
org
Documentatio
n
/git-tag
.
t
x
t:
m
inor typo
and grammar
fix
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-29
Junio C
H
am
a
no
Prepare f
o
r v1
.
6
.
1
.
1
m
a
intenan
c
e release
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-29
jidanni@ji
d
a
n
ni
.
org
Do
c
umentation/
d
i
ff-o
p
t
io
n
s
.
txt: unify options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-29
Markus H
e
ide
l
berg
doc/git-send-email
:
m
ention sendemail
.
cc
c
onf
i
g variab
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-28
Devin Doucette
gitweb
:
Fix export
c
heck in git_
g
et_projects
_
list
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-27
J
uni
o
C H
a
mano
Merge
b
ranch 'rs/mai
n
t-tformat-fol
d
line' into maint
commit
|
commitdiff
|
tree
2008-12-27
Junio
C
Ham
a
n
o
Merge branch 'rs/maint-
r
etval-fix' into maint
commit
|
commitdiff
|
tree
2008-12-27
Ju
n
i
o
C Ham
a
no
Merge branch 'sp/ma
i
nt
-
d
e
scrib
e
-all-tag-wa
r
n
i
ng' into
.
.
.
commit
|
commitdiff
|
tree
2008-12-27
Ade
o
dat
o
Simó
git-send-email
.
t
x
t:
m
ove --format
-
p
atch
par
a
graph
t
o
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-27
Adeodat
o
Simó
git-shortlog
.
txt: improve documentatio
n
a
b
o
ut
.
mailmap
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-27
R
en
é
Scharfe
p
r
e
tty: support multiline sub
j
e
c
t
s
wit
h
format:
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-27
R
ené Sch
a
rfe
pretty: f
a
ctor ou
t
format_subject()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-27
René Scharfe
pr
e
tty: factor out skip
_
empty_
l
ines()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-27
R
e
n
é
Sc
h
a
rfe
merge
-
f
i
le: handle freopen() failure
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-27
René
S
char
f
e
daemon
:
cleanup:
f
actor o
u
t xstrd
u
p_tolower()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-27
René Scharfe
daemon: cleanup:
r
ep
l
ac
e
loop with if
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-27
René Scharfe
daemo
n
: handle freop
e
n() f
a
i
lure
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-27
Shawn O
.
P
earce
descr
i
be: Avoid
u
n
necessary warning when usi
n
g --al
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-25
J
o
h
a
nnes
Schindelin
merge-
r
e
cursive: mark rename/delete conflict as
unmerged
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-25
J
u
n
io
C Hamano
GIT 1
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-24
Ju
n
io C Ham
a
no
Merge branc
h
'js/reba
s
e-i-p'
commit
|
commitdiff
|
tree
2008-12-24
Johannes S
c
hindelin
re
b
a
se -i -p:
lea
v
e
a --cc patch when a
m
erge co
u
l
d
.
.
.
commit
|
commitdiff
|
tree
2008-12-23
Miklos
V
ajna
t9129
:
sk
i
p the
l
ast thre
e
tests i
f
UTF-8 l
o
cale i
s
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-22
Jun
i
o
C Ham
a
no
GIT 1
.
6
.
1-rc4
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-22
Richar
d
Hartmann
Always show whic
h
directory is not a git
repository
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-22
Ri
c
hard Hartmann
Make help entri
e
s alphabetic
a
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-22
J
unio C Haman
o
Mer
g
e branch 'maint'
commit
|
commitdiff
|
tree
2008-12-22
B
o
yd Stephen Smith Jr
git-revert d
o
cu
m
e
n
t
atio
n
:
refer to new
HOWTO
o
n reverting
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-22
Rob
i
n
Ros
e
nberg
git-revert
:
record
t
h
e parent against which a revert
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-22
Junio C Hama
n
o
Merge g
i
t:/
/
git
.
kernel
.
or
g
/pub/scm
/
gitk/gitk
commit
|
commitdiff
|
tree
2008-12-21
Markus Heidelberg
doc/
g
it-fsck: cha
n
ge th
e
way for getting
h
ea
d
s'
SHA1s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
M
a
rkus Heidelberg
Do
c
umentation/git-sh
o
w
-branch: wo
r
k around "si
n
gl
e
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
J
u
nio
C H
a
mano
send
-
email:
f
utureproof split_addrs() sub
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
Ju
n
io C Ham
a
n
o
Make sure lo
c
kfiles a
r
e unlo
c
ked
w
hen dying o
n
SIGP
I
PE
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
R
ené Scharfe
fas
t
-
imp
o
rt
.
c: stricter st
r
toul check
,
silence compiler
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
René Scharfe
connec
t
.
c:
s
tri
c
ter
p
o
r
t va
l
ida
t
i
o
n
, silence
c
omp
i
ler
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
Nanak
o
Shir
a
ishi
Add a d
o
cumentat on how
to rev
e
r
t
a fault
y
merg
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
Kirill A
.
Korinski
y
Remove t
h
e requirement o
p
a
q
u
e
locktoken uri scheme
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
Marcel M
.
Cary
git-sh-setup
:
Fix scripts whose PW
D
i
s a sy
m
l
i
nk into
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
Joh
a
nnes Sixt
rebase
-i
-
p:
F
ix
-
-continue after
a
merg
e
could not
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
Johannes
S
ixt
Show a fai
l
ure
o
f
rebase -p
if
the merge had
a
c
onflict
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Mark
u
s Heidelberg
Documentation: fix typos,
g
rammar,
a
sciidoc syn
t
a
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
J
u
nio C Hamano
Me
r
ge b
r
anch 'maint' to sync
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
Junio C
Hama
n
o
f
a
st-import: make
tagge
r
inf
o
r
mation optional
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
J
ohan
n
es Schinde
l
in
fast-ex
p
ort: deal wi
t
h tag ob
j
ects that do not have
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Mik
l
os Va
j
na
S
ubmittingPat
c
hes
:
menti
o
n the
usag
e
of real name in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
David Aguil
a
r
git-mer
g
e
t
ool: properly
handle "git merg
e
tool
-
- filename"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Wu Fengg
u
ang
g
it-send-email: handle email address w
i
th quoted comma
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Markus H
e
idelberg
D
o
cume
n
tation: fix
t
y
pos,
gr
a
mm
a
r,
a
s
ciidoc syntax
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-19
Markus Heidel
b
erg
Documentation: sync example output wi
t
h gi
t
output
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
René Scharf
e
Fi
x
type-mismatch compile
r
war
n
ing from diff_populate_filespec()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
Mic
h
a
e
l
J Gruber
te
s
t
o
verlapping
ignore p
a
tt
e
rns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
J
u
nio
C
Hamano
Merge bran
c
h 'lt/readlink'
commit
|
commitdiff
|
tree
2008-12-18
Arjen La
a
rhoven
Enable thr
e
aded delt
a
search on Ma
c
OS X/
D
arwin
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
N
a
nako Sh
i
r
a
ishi
Cl
a
rify documentation of "git c
h
eckout
<
t
ree-is
h
> paths
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
Junio C Hamano
Me
r
ge gi
t
:
/
/repo
.
o
r
.
cz/git-gui
commit
|
commitdiff
|
tree
2008-12-17
M
i
klos Vajna
g
ith
o
o
k
s
d
ocume
n
tation: add a note about the +x
mode
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
J
uni
o
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 Hamano
builtin-blame
.
c: use strbuf_rea
d
lin
k
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Hamano
make_abs
o
lute_p
a
t
h(): c
h
eck bounds wh
e
n seeing a
n
overlong
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Linus Torvalds
Make 'prepare_
t
emp_file()'
i
g
nore st_size for symlinks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Linus Tor
v
alds
M
a
ke
'
di
f
f_populate
_
filespec()' us
e
t
h
e new
'
s
trbuf_readlink()'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Linus Torv
a
lds
M
ake
'
index_path()' use
'strbuf_r
e
adlink()
'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Linus Torvalds
Make 'ce_compar
e
_
link()' use
t
he ne
w
'strbuf_read
l
ink()'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Linus Torvalds
Add generic '
s
trbuf
_
readli
n
k()' helper func
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Markus Heidelbe
r
g
doc
/
git-reset: a
d
d reference to git-stash
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Markus Heidel
b
erg
Doc
u
men
t
ation: fix description fo
r
enabl
i
ng ho
o
k
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Miklos Vajna
g
i
t-dae
m
on d
o
c
u
mentation: use {tilde}
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio C H
a
mano
git
w
eb: do not run "gi
t
diff" tha
t
is Porcelain
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Ha
m
ano
GIT 1
.
5
.
6
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
J
unio
C
Hamano
GIT 1
.
5
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Ju
n
io C Hamano
GI
T
1
.
5
.
4
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Hamano
g
itwe
b
:
do not run "git diff" tha
t
is Porcelain
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-16
Lee Marlow
b
a
s
h comple
t
i
o
n
: Sync confi
g
variables
with the
i
r man
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-16
Lee Marlow
b
ash completion
:
So
r
t config co
m
pletio
n
va
r
iables
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-16
Junio
C
Hamano
Merge bra
n
ch 'ma
i
n
t
'
commit
|
commitdiff
|
tree
2008-12-16
Johannes Schindelin
fast-imp
o
rt: close pack
be
f
o
re unlinking it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
Junio C Hamano
m
erge-recu
r
s
i
ve: d
o
not clobber untrack
e
d work
i
ng tree
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
Clemens Buchacher
modify
/
de
l
ete conflict resolution overwrites un
t
racked
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
Junio C Haman
o
pager: do not dup2 stderr if it i
s
a
l
ready redirect
e
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
Junio C Ha
m
ano
git-show
:
d
o no
t
segfau
l
t when s
h
owing a bad tag
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
Johannes Schindelin
G
e
t rid of the last remna
n
ts of GIT_C
O
NFIG_LOCAL
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next