repo.or.cz
/
git
/
gitbuild.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Add a documentat on how to revert a faulty merge
2008-12-21
Nanako Shir
a
ishi
Add a
documentat on how to rev
e
rt
a
faul
t
y merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
Ki
r
ill A
.
K
o
r
inskiy
Remove the r
e
quirement opaquelocktoken u
r
i scheme
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
Ma
r
cel
M
.
Cary
git-sh-setu
p
: Fix scr
i
p
t
s
who
s
e
PWD is a sym
l
in
k
into
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Markus Heide
l
berg
Docu
m
entation: fix
typos, g
r
ammar,
asc
i
ido
c
s
yntax
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Ju
n
io
C
H
a
mano
Merge branc
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
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
H
a
mano
fast-import: make
tagger
informa
t
ion
o
ptional
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Johannes Sch
i
nd
e
lin
fast-expo
r
t: deal with tag objects that do not have
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Miklo
s
Vajn
a
SubmittingPatches: mention the us
a
ge of r
e
a
l name in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Davi
d
Ag
u
ilar
g
it-mergetool: properly handle "git mergetool
-- fi
l
ename
"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Wu
Fe
n
gguan
g
git-send-email: h
a
nd
l
e email addre
s
s wit
h
quot
e
d comm
a
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Markus Heidelberg
Documentati
o
n: fix typos,
grammar, a
s
c
iid
o
c syntax
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-19
Marku
s
H
e
idelberg
Documenta
t
ion: sync example ou
t
put w
i
th git
o
utput
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
René
Schar
f
e
Fix type-mismatch compiler warning from d
i
f
f_p
o
pulate_filespec
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
Micha
e
l
J
Gruber
tes
t
overlapping ig
n
ore patterns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
Junio
C Hamano
Merge branch 'lt/readlink'
commit
|
commitdiff
|
tree
2008-12-18
Ar
j
e
n
L
a
arhoven
Enable threa
d
ed delta search on Mac OS X
/
Darwin
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
Nanako S
h
irai
s
hi
Clarify doc
u
menta
t
ion of "git checkou
t
<tree-i
s
h> paths
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
Junio C Hamano
Mer
g
e git://repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2008-12-17
Miklos Vajna
g
i
thooks documentati
o
n: add a
n
o
te abo
u
t
the
+x
m
o
d
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio
C
Hamano
com
b
ine-di
f
f
.
c: use strbuf_readlink()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio
C Hamano
builti
n
-
blame
.
c: use strbuf_read
l
ink()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio
C
Hamano
make_absolute_path(): check
b
ound
s
when
s
eeing an overlo
n
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Linus Torv
a
lds
Make 'pre
p
are_temp_fil
e
()' ignore st_size for symlinks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Linus Torvalds
Ma
k
e 'diff_popu
l
ate_filespe
c
()' u
s
e t
h
e n
e
w 'strbuf_readlink()'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Linus Torvalds
Make 'ind
e
x_path()' use 's
t
r
buf_readlink()'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Linus
T
orvalds
Mak
e
'ce_compare_link()' use the
n
ew 'strbuf_readlink()'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Linus Torvald
s
Add
g
eneric
'strbuf_readlink()' helper function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Markus Heidelberg
doc/git-reset: add ref
e
rence to git-stash
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
M
a
r
ku
s
Heid
e
lberg
Documentat
i
on: fix description for
enabling
h
o
oks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
M
i
klos Vajna
g
i
t-daemon documentation: us
e
{tilde}
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Ha
m
ano
gitweb
:
do not run "git diff"
t
hat is Po
r
celain
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Haman
o
GIT
1
.
5
.
6
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio
C
Hamano
G
I
T 1
.
5
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio
C
H
amano
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
gitweb: do not
r
un "git diff" tha
t
is Porce
l
ain
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-16
Lee Marlow
bas
h
completion
:
Sync co
n
fig variables
w
i
th
their man
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-16
Lee Mar
l
ow
bash comple
t
ion: Sort co
n
fig compl
e
tion vari
a
bles
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-16
Junio
C
Hamano
Merge branc
h
'main
t
'
commit
|
commitdiff
|
tree
2008-12-16
Johannes Schindelin
fast-impor
t
: close pa
c
k be
f
o
r
e
unlin
k
ing
i
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
Junio C H
a
ma
n
o
pager:
d
o not dup2 s
t
de
r
r if it is already redi
r
ecte
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
Junio C H
a
mano
git-show
:
do
n
ot segfau
l
t when showing a
b
ad tag
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
Joh
a
nnes Schinde
l
in
Get ri
d
o
f
the last
r
em
n
ants of
G
IT_CONF
I
G
_LOCAL
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
Alexander
G
avri
l
o
v
Documentation: Describe git-gui Tool
s
menu c
o
nfigur
a
tion
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
YONETANI Tomokazu
git-fast-import possible
memory corruption pr
o
b
lem
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-13
Markus
H
eidel
b
erg
builtin-
c
ommit: remove un
u
sed m
e
ssage
v
a
r
iable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-13
Junio
C Hamano
M
er
g
e bran
c
h 'main
t
'
commit
|
commitdiff
|
tree
2008-12-13
Br
a
ndon Casey
g
i
t-branch
:
d
i
splay sha1 on
b
ran
c
h deletion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-13
Jim Meyering
g
it-config
.
txt:
fix
a typo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-11
Ju
n
io C
Hamano
M
e
rge br
a
nch 'maint'
commit
|
commitdiff
|
tree
2008-12-11
Linus Torva
l
ds
fs
c
k:
reduce
s
tack footprint
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-11
Je
f
f K
i
ng
reb
a
se: improve error message
s
about
d
i
r
t
y
state
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-11
Nico
l
as Pitre
m
a
ke s
u
re packs to b
e
replaced
a
re closed
befor
e
h
and
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Alexander Potashev
Fi
x
t
ypo in comment in
builtin-add
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Ju
n
io C Hamano
Fix t4031
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Junio C Ha
m
a
n
o
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2008-12-10
Jeff King
d
i
ff: respect text
c
o
nv in r
e
write di
f
fs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Jeff King
diff: fix hand
l
ing of
b
inary
rewri
t
e diffs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Alexander
P
otashev
F
i
x t
y
pos in documentati
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Tor
A
r
v
id Lund
git
-
p4: Fix regression in p4Where
m
ethod
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Ralf W
i
lden
h
ue
s
Improve language
i
n git-mer
g
e
.
txt and related docs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Juni
o
C
H
am
a
no
w
o
rk around P
y
thon warnings fr
o
m AsciiDoc
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-09
A
le
x
ey
B
orze
n
kov
Define lin
k
g
i
t macro in [macros] sectio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-09
Deski
n
Mil
l
er
git-sv
n
:
Make fol
l
owing parents atom
i
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Jakub Narebski
gitweb: Fix bug in in
s
er
t
_f
i
le() sub
r
outine
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Jeff Kin
g
di
f
f: allow t
u
rning on tex
t
c
o
n
v
explicitly f
o
r plumbing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
J
e
ff Ki
n
g
reorder AL
L
OW_TEXTCONV option setting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Junio C Hamano
read-cache
.
c
: typofi
x
in comment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Junio C H
a
mano
buil
t
i
n-c
h
ecko
u
t
.
c: c
h
ec
k
e
rror
return from read_cache()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Juni
o
C
H
a
mano
Point "stale" 1
.
6
.
0
.
5 docu
m
entation from th
e
main git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Junio C H
a
mano
Rever
t
"git-stash: use git rev-parse
-q"
commit
|
commitdiff
|
tree
2008-12-07
Junio C Ha
m
an
o
Updat
e
draft rele
a
se
n
otes for
1
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Junio
C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-12-07
Junio
C Hama
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 revers
e
order of arguments
commit
|
commitdiff
|
tree
2008-12-07
Jeff King
t
ag: de
l
ete TAG_EDIT
M
SG only
o
n
su
c
ce
s
sfu
l
tag
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Jakub
Nar
e
bski
g
i
t
web: Make
proj
e
ct spec
i
fic
over
r
ide for 'grep' feature
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Mikl
o
s Vajna
http
.
c: us
e
'
g
it_config_strin
g
'
to get 'curl_http_
p
roxy'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Thom
a
s Rast
fetch-
p
ack: Avoid mem
c
py() with src==dst
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-06
Junio C Hamano
Upd
a
te
draf
t
re
l
ease notes
t
o 1
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-06
Junio C
Ham
a
no
Merge br
a
nch 'jc/a
m
-op
t
ions'
commit
|
commitdiff
|
tree
2008-12-06
Junio C
Hamano
git-am: renam
e
appl
y
_opt_extra
f
i
l
e
to apply-opt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Junio C Ha
m
ano
Tes
t
that git
-
am does not lose -C/-p/-
-
whitespace options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Jun
i
o C Hamano
git-am: propaga
t
e
--3way opt
i
ons as
w
el
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Junio C Hamano
git-am: pro
p
agate
-C<n>
,
-p<
n
> options a
s
w
e
ll
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Jun
i
o C
H
amano
git-am --whitespace:
d
o not lose
the
c
omma
n
d line opt
i
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 bug
i
n p4Where method
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Al
e
x Riesen
Report symlink failur
e
s in merge-recu
r
sive
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Alex Riesen
Make chdi
r
failures vi
s
ibl
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Alex Ri
e
sen
Mak
e
s
o
m
e of
fwrite
/
fclose/wri
t
e/cl
o
se failures vi
s
ib
l
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-04
J
u
nio
C
Hamano
Merge branch 'dm
/
svn-remote'
commit
|
commitdiff
|
tree
2008-12-04
Jun
i
o C Hamano
Merge branch 'jn/git
w
e
b-utf
8
'
commit
|
commitdiff
|
tree
2008-12-04
Jeff
K
ing
a
d
d st
a
ge to giti
g
n
ore
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
submodul
e
: use g
i
t
r
e
v-parse -q
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Miklos
V
a
j
na
r
e
base: use git
r
ev-parse -q
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
p
u
ll: u
s
e gi
t
rev-parse -q
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Miklos
Vaj
n
a
lost-
f
ound: use git rev
-
parse -
q
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Miklo
s
Vajna
f
ilter-branch: use git
rev-pars
e
-q
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Desk
i
n Miller
git-svn:
M
ake branc
h
use
c
orrect sv
n
-
remote
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Junio C Hamano
Merge branch
'
jc/
r
m-i-t-a'
commit
|
commitdiff
|
tree
next