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
Add a documentat on how to revert a faulty merge
2008-12-21
N
anako
Sh
i
raishi
Add a
d
ocumentat
o
n ho
w
t
o revert
a
fa
u
l
t
y merge
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
Kirill
A
.
Korinskiy
Remov
e
th
e
requ
i
re
m
ent op
a
quel
o
ckto
k
e
n
uri scheme
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-21
M
arc
e
l
M
.
Cary
git-sh-s
e
tup: Fix
scripts whose PWD is
a
symlink into
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Ma
r
kus
H
eidelberg
D
o
cumentati
o
n: fix typos, gram
m
ar,
a
sciidoc
s
yntax
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Junio C Ham
a
no
Merge bra
n
ch
'maint' to syn
c
with 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 Hamano
fast-import: make
t
agger informati
o
n optional
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Jo
h
a
nn
e
s Schin
d
el
i
n
fast-export
:
deal with
t
ag obje
c
t
s that do n
o
t have
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Miklos Vajna
Submittin
g
Patches: mention the usage of real n
a
me in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Dav
i
d Ag
u
i
lar
git
-
mer
g
etool
:
prop
e
rly handle "git mergetool -
-
filename"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Wu Fenggua
n
g
git-send-email:
han
d
le ema
i
l address
w
ith q
u
ot
e
d comma
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Marku
s
Hei
d
elb
e
rg
Docume
n
tat
i
o
n
:
fix typos, grammar, as
c
iidoc synt
a
x
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-19
Marku
s
Heidelberg
Docum
e
ntation: s
y
nc
e
x
a
mple
output with git output
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
René
S
charfe
Fix type-mismatch compiler war
n
ing from diff_populate_fi
l
espec()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
Michael J Gr
u
ber
test overlapp
i
ng ignore patterns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
Junio C Hamano
M
e
rge br
a
n
ch 'lt/read
l
ink'
commit
|
commitdiff
|
tree
2008-12-18
Arj
e
n Laarhoven
E
n
able thr
e
a
d
e
d
delt
a
search
on Mac OS X/D
a
rw
i
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
N
a
nako Shirai
s
hi
Clarify documentation of
"
git c
h
eckout <t
r
e
e-ish> pa
t
hs
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
Junio C H
a
mano
Merge gi
t
://repo
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2008-12-17
Miklos V
a
jna
githooks documentat
i
on: add a note about t
h
e +x
mode
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Jun
i
o C Hamano
c
ombine
-
diff
.
c:
u
s
e
s
t
rbuf_re
a
dlink()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio C
Hamano
bui
l
tin-bl
a
me
.
c
:
us
e
strbuf_readlink(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
J
u
nio C Hamano
m
ak
e
_absolute_pat
h
(): check bounds when
s
e
ei
n
g a
n
overl
o
n
g
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Li
n
us T
o
rva
l
ds
Make 'prepare_te
m
p_f
i
le()' ign
o
r
e
st_size fo
r
s
ymlinks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Linus Torvalds
Make 'diff_populate_
f
ilespec()' use
t
he
new 'str
b
uf_readlink()'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Linus Torvalds
Make 'index
_
path()' use
'strbuf_read
l
ink()'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
L
i
nu
s
Torv
a
lds
Make 'ce_
c
ompare_link()
'
use
th
e
ne
w
'
s
trbu
f
_rea
d
link()'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Linus
Torvalds
Add gen
e
ric 'strb
u
f_
r
eadlink
(
)' helper functi
o
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Mark
u
s Heid
e
lbe
r
g
do
c
/git-res
e
t: add re
f
eren
c
e to git-
s
tash
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
M
a
r
k
us Heidelberg
Doc
u
m
entation: fix d
e
scription for
ena
b
ling
hooks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Miklos Vajna
g
i
t-daemon documentation: u
s
e {tilde}
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Ju
n
i
o
C Ham
a
no
gi
t
web: do not run "git diff" t
h
at is Porcela
i
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio C
H
a
man
o
GIT 1
.
5
.
6
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Ham
a
no
GIT 1
.
5
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio
C
Hamano
GIT 1
.
5
.
4
.
7
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio
C Hamano
gitw
e
b: do not run "git diff"
t
hat is Porcelain
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-16
Lee Marl
o
w
bash
c
ompletion: Sync confi
g
variables with thei
r
man
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-16
L
ee Ma
r
low
bash complet
i
on: So
r
t
c
onf
i
g comp
l
etion variable
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-16
Junio C H
a
man
o
Merge branch
'm
a
i
nt
'
commit
|
commitdiff
|
tree
2008-12-16
Johannes Schindelin
fas
t
-import
:
close pack bef
o
re
un
l
ink
i
n
g
i
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
Juni
o
C Hama
n
o
pager:
do not dup2 stderr
i
f
it is alrea
d
y re
d
ir
e
ct
e
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
Junio C
H
a
mano
git-
s
how:
d
o not segf
a
ult when s
h
o
wing a bad tag
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
Johan
n
e
s
Schinde
l
in
Get rid of t
h
e last remnants of
GIT_CONFIG_LOC
A
L
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
Alexand
e
r Gavrilov
Docume
n
tation: Describ
e
git-gui Tools men
u
configuration
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
YONETANI Tomokazu
g
it-fast-import p
o
s
s
ible memory
c
orru
p
tion problem
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-13
Ma
r
k
u
s Hei
d
el
b
erg
builtin-
c
ommit: remove unused m
e
ssa
g
e variable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-13
Jun
i
o C H
a
man
o
M
e
rge branch 'ma
i
nt'
commit
|
commitdiff
|
tree
2008-12-13
Brandon Casey
gi
t
-branch: disp
l
a
y sha1 o
n
bra
n
ch
dele
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-13
Jim Meyering
git-confi
g
.
tx
t
: fix a typo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-11
Juni
o
C
Hamano
Mer
g
e b
r
anch
'maint'
commit
|
commitdiff
|
tree
2008-12-11
Linus Torvalds
fsck: reduce s
t
ack
f
ootprint
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-11
Jeff King
rebase: improve
err
o
r messages about dirty state
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-11
Nic
o
las Pitre
m
ake sure
packs to be repl
a
ce
d
a
re closed beforeha
n
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
A
l
ex
a
n
d
er Potashev
Fi
x
typ
o
i
n
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 t
4
031
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Junio C Hamano
M
er
g
e
b
ra
n
ch 'maint'
commit
|
commitdiff
|
tree
2008-12-10
Jeff
King
dif
f
: respect textconv in rewrite
d
iffs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Jeff King
diff: fix handling of
b
inary rewrite di
f
fs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Alexander P
o
tashev
F
ix typos in
d
ocumentation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
T
o
r Arvid Lund
g
i
t-p
4
: Fix regression
in p4Where method
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Ralf Wil
d
enhues
I
m
p
rove language i
n
git-merge
.
txt an
d
related docs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Ju
n
i
o
C
H
a
mano
wo
r
k aro
u
nd Pyth
o
n warnings
f
r
om AsciiDoc
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-09
Alexey Borzenkov
Define linkgit macr
o
i
n
[
m
acros] section
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-09
De
s
kin Miller
git-sv
n
: M
a
k
e
f
ollow
i
n
g p
a
rents
a
tomic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Ja
k
u
b
Narebski
gi
t
web: Fix bug in inse
r
t_file() sub
r
out
i
n
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
J
eff King
diff: allow t
u
rning on textcon
v
expli
c
itly for plu
m
b
i
ng
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
J
eff
King
reorder ALLOW
_
T
E
XTCO
N
V option
s
etting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Junio C Ha
m
ano
r
ead-cache
.
c: ty
p
ofix in c
o
mme
n
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
J
un
i
o C Hamano
bui
l
tin-checko
u
t
.
c: check
e
rror
r
e
turn
f
rom rea
d
_c
a
che()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Junio C Haman
o
Point "stal
e
" 1
.
6
.
0
.
5 documentation from the m
a
in g
i
t
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Juni
o
C Hama
n
o
Revert "git-stash
:
us
e
git rev-parse -q"
commit
|
commitdiff
|
tree
2008-12-07
Junio C
Hamano
U
pdate dr
a
ft
release note
s
for 1
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Junio C Hamano
M
e
r
ge bran
c
h 'mai
n
t'
commit
|
commitdiff
|
tree
2008-12-07
Ju
n
io C H
a
mano
GIT 1
.
6
.
0
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Matt McCutchen
"git d
i
ff <t
r
ee
>
{3,}": d
o
not reverse
o
r
d
e
r
of argum
e
nts
commit
|
commitdiff
|
tree
2008-12-07
Jeff Kin
g
ta
g
: d
e
lete TAG_
E
D
I
TM
S
G
only on successful tag
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Jakub Nare
b
s
k
i
gitwe
b
: Make projec
t
s
pecific
o
verride fo
r
'
grep'
f
eature
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Mikl
o
s V
a
jna
http
.
c: use 'git_config_string' to get '
c
u
rl_http_proxy'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Thomas Rast
fetch-pa
c
k: Avoid
memcpy() with src==
d
st
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-06
J
u
nio
C Hamano
Update draft
r
e
l
ease notes to
1
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-06
J
unio C Ha
m
an
o
Merge br
a
nch 'jc/am-opt
i
ons'
commit
|
commitdiff
|
tree
2008-12-06
Junio C H
a
mano
git-am:
r
ename a
p
p
l
y_opt_extr
a
f
i
l
e to app
l
y-
o
p
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Jun
i
o C Ham
a
no
T
e
st that g
i
t-am does not l
o
s
e -C
/
-p/
-
-whitespace options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Junio C Ham
a
no
g
i
t
-am:
propagate --
3
way o
p
tio
n
s
as well
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Ju
n
io C H
a
mano
git-am:
p
ropagate -C<n>, -p
<
n>
o
ptions as we
l
l
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
J
un
i
o C Hama
n
o
g
it-am
-
-whitespace: do not lose the
c
om
m
and li
n
e option
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Tor Arvid Lund
git
-
p4
:
Fix bug in p4W
h
ere method
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Alex Riesen
Repo
r
t symlink fa
i
lur
e
s i
n
me
r
g
e
-re
c
ursive
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
A
l
e
x Riesen
Make chdir
f
ail
u
re
s
visible
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Alex Riesen
M
a
ke some of fwrite/fclose/write/clo
s
e failu
r
es visibl
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-04
Junio C Hamano
Merge
b
ranch
'
d
m
/
s
vn-r
e
mote'
commit
|
commitdiff
|
tree
2008-12-04
Juni
o
C
H
a
m
a
no
Merge branch 'jn/gitweb-ut
f
8
'
commit
|
commitdiff
|
tree
2008-12-04
Jeff Ki
n
g
a
dd
s
tage to gitig
n
o
r
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Mikl
o
s
V
ajna
s
ubmodule: use
gi
t
r
ev-
p
arse -q
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajna
rebase
:
use git
r
e
v
-
p
arse -q
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Mik
l
os V
a
jna
p
u
ll: use git rev-p
a
r
s
e -
q
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
M
iklo
s
Vaj
n
a
lost-fo
u
nd: use g
i
t re
v
-
p
ar
s
e
-q
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Mik
l
os Vajna
fil
t
er-b
r
anch:
u
se
g
it
rev-parse -q
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Deskin Mille
r
git-
s
vn: Ma
k
e branch us
e
corre
c
t svn-
r
emo
t
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Junio C Hamano
Merge bra
n
ch 'j
c
/rm-i-t-a'
commit
|
commitdiff
|
tree
next