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
Show a failure of rebase -p if the merge had a conflict
2008-12-21
Johann
e
s
S
ixt
Show a fa
i
lure of rebase -p if the merge had a conflict
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Markus Heidelb
e
r
g
Docu
m
e
n
tation
:
fix
t
ypos,
grammar,
a
sc
i
idoc syntax
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Junio C Hamano
Me
r
ge branch '
m
aint' to s
y
n
c with
G
IT 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
GIT 1
.
6
.
0
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Juni
o
C Hamano
fa
s
t-impo
r
t: make tagger info
r
mation op
t
ional
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
J
oha
n
nes Schindelin
fast-ex
p
ort: deal with tag objects that do not have
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Miklos
V
a
j
na
Submitti
n
g
P
a
tches:
m
ention the usage of real name in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
David Agu
i
lar
g
i
t-mergetool: properly handle
"
git mergeto
o
l -
-
filename"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Wu Fengguang
gi
t
-send-em
a
il:
handle e
m
a
i
l
a
d
dress with q
u
oted comma
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
M
a
r
kus
H
e
idelberg
Documentation: fix typos, grammar, asciid
o
c
syn
t
ax
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-19
Ma
r
kus
He
i
delberg
Doc
u
mentatio
n
: sy
n
c exa
m
ple output with g
i
t
output
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
René Schar
f
e
Fix type-mismat
c
h com
p
iler warning
f
rom diff_po
p
ulate
_
filespec()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
Mic
h
ael J Gruber
test ove
r
lapping ig
n
or
e
patterns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
Junio C Hamano
Me
r
ge branc
h
'lt/read
l
ink'
commit
|
commitdiff
|
tree
2008-12-18
Arjen Laarhoven
Enable thre
a
de
d
delta search on
M
ac O
S
X/Darwin
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
Nanako Shiraishi
C
l
ari
f
y docum
e
ntation of
"git checkout <tree-ish> paths
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
Junio C Hamano
Me
r
ge git:
/
/rep
o
.
or
.
cz/git-gui
commit
|
commitdiff
|
tree
2008-12-17
Miklos Vajna
g
i
thoo
k
s
docume
n
t
a
tion:
add a note abo
u
t the +x mode
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
J
unio C Hamano
combine-diff
.
c
: use strb
u
f_readlink()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Ham
a
no
b
uiltin-bla
m
e
.
c: use strb
u
f_readlink()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Ju
n
io C Hama
n
o
m
ake_absolute
_
path(): che
c
k bou
n
ds when s
e
eing an
o
v
erl
o
ng
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Linus Torv
a
l
ds
Make 'prepare
_
temp_file()' ignore
st_size for symlinks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Linus
T
o
rvalds
Ma
k
e 'diff_populate_filespec()'
u
se t
h
e new 'strbuf_readl
i
nk()'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Linus To
r
valds
Make 'index_path()' use 'strbuf_readlink()'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Linus To
r
valds
Make 'c
e
_
compare_link()' use t
h
e
n
ew '
s
trb
u
f_rea
d
li
n
k()'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
L
i
nus Torvalds
Add gen
e
ri
c
'strbuf_readlink()' helper func
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Marku
s
H
eidelberg
doc/git-
r
eset: add ref
e
ren
c
e to git-s
t
ash
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Mark
u
s Hei
d
elbe
r
g
Documentation: fix description f
o
r
e
nabling ho
o
ks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Mikl
o
s
V
ajna
git-daemon document
a
tion: use {tilde}
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
J
unio C
H
a
mano
g
i
tw
e
b: do not run "gi
t
diff" that is Porcelain
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio
C
Hamano
G
I
T
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
gitweb:
d
o
n
ot r
u
n "g
i
t di
f
f"
t
hat is Porcel
a
in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-16
L
ee Mar
l
o
w
b
a
s
h
compl
e
tion: Sync config
v
ariables with their
man
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-16
Lee Marlow
b
a
sh completion: Sort config
c
ompletio
n
variables
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-16
Junio C Hamano
Me
r
ge branch 'maint'
commit
|
commitdiff
|
tree
2008-12-16
Johann
e
s Sc
h
i
n
delin
fa
s
t-impor
t
: close pack
b
efore unlinki
n
g it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
Junio C
H
a
mano
pager: do not
d
up2 stderr if it i
s
alr
e
ady redire
c
te
d
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
Junio C Hama
n
o
git-
s
how: do not s
e
g
f
a
ul
t
when
s
how
i
n
g
a
b
a
d
tag
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
Joh
a
nnes Schindelin
Get rid of
t
he last remnants of GIT_
C
ONFIG
_
LOCAL
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
Alexander Gavrilov
Documen
t
ation: Describe git-gui Tools
me
n
u configura
t
ion
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
YO
N
ETANI Tomokazu
git-fast-import
p
ossible memor
y
corruptio
n
problem
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-13
Markus Heidelberg
builti
n
-commit: r
e
move unused
message varia
b
le
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-13
Junio C Hamano
Merge branch 'maint'
commit
|
commitdiff
|
tree
2008-12-13
Brandon Cas
e
y
git-b
r
anch: dis
p
lay
s
h
a1 on branch
d
elet
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-13
J
im
Me
y
ering
git-config
.
tx
t
: fix a
t
ypo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-11
Juni
o
C Ha
m
ano
Merge bra
n
ch 'main
t
'
commit
|
commitdiff
|
tree
2008-12-11
L
i
nus Torvalds
f
s
ck: reduce sta
c
k footprin
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-11
Jeff K
i
ng
reb
a
se: improve erro
r
messag
e
s abou
t
dirty
s
tat
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-11
Nicol
a
s
P
itre
make sure packs t
o
be replaced
a
re closed b
e
f
o
rehand
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Alexander Potash
e
v
Fix typo
i
n com
m
e
nt in builtin-ad
d
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Junio
C Ham
a
no
Fix t
4
031
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Ju
n
io C Hamano
Merge branch 'main
t
'
commit
|
commitdiff
|
tree
2008-12-10
Je
f
f
K
ing
diff: res
p
e
c
t textcon
v
in
rewri
t
e diffs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Jeff King
diff: fix
handling of
b
inary
r
ewrite dif
f
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Alexander P
o
tashev
F
i
x typos in documentation
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Tor Arvid Lu
n
d
git-p4: Fix regression in p4Where method
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Ralf Wildenhues
Improve lang
u
a
g
e in git-merge
.
txt and related
d
oc
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Junio
C
Hamano
work aro
u
nd Python warnings from AsciiDoc
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-09
A
lexe
y
Borzenko
v
D
e
fine linkgi
t
m
a
cro in [mac
r
o
s] se
c
tion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-09
Deskin Miller
git
-
svn:
Make
followin
g
par
e
nts atomic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Jakub Narebski
gitw
e
b: Fi
x
bug in insert_file(
)
subroutine
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Jeff
King
diff: allow turning
o
n t
e
xtc
o
nv explicit
l
y for plumbing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Jeff Ki
n
g
reorder AL
L
OW_TEXTCONV o
p
t
io
n
setting
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
J
unio C H
a
m
an
o
read-cac
h
e
.
c: ty
p
ofix
in comment
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Juni
o
C
H
ama
n
o
b
uil
t
in-checkout
.
c: check error return from read_cache
(
)
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Junio C Hamano
Point "s
t
ale" 1
.
6
.
0
.
5 documen
t
ati
o
n from th
e
main git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Junio
C Hamano
Revert "g
i
t-stash: use g
i
t rev-parse -q
"
commit
|
commitdiff
|
tree
2008-12-07
Junio
C
Hamano
U
p
date
d
raft
rele
a
se note
s
f
o
r 1
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Junio
C
Haman
o
Merge br
a
nch '
m
ai
n
t'
commit
|
commitdiff
|
tree
2008-12-07
Jun
i
o C
Hamano
GIT 1
.
6
.
0
.
5
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Matt McCutchen
"git diff <tree>{3,}": do not reverse ord
e
r o
f
a
r
gu
m
ents
commit
|
commitdiff
|
tree
2008-12-07
Jeff King
tag:
dele
t
e TAG_EDITMSG only on successful tag
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
J
ak
u
b Narebski
gitweb: Mak
e
project specific over
r
ide for
'
grep' feat
u
re
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Miklos Vaj
n
a
ht
t
p
.
c: use 'git_config_string'
to get 'curl
_
h
ttp_proxy'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Thomas Rast
fetch-p
a
ck:
A
void
m
emcp
y
() with
s
rc==d
s
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-06
Ju
n
io C Hamano
Upda
t
e
d
raft release 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-opti
o
ns'
commit
|
commitdiff
|
tree
2008-12-06
Junio C Haman
o
gi
t
-am
:
rename ap
p
ly_o
p
t_extra file
t
o apply-opt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
J
unio C Ham
a
no
Tes
t
t
h
at g
i
t-am does not lose -C/-p/--whit
e
s
pa
c
e options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Junio
C Hamano
git-
a
m
:
p
ropa
g
at
e
--3
w
ay o
p
tions as well
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
J
u
nio C Hamano
git
-
a
m
:
prop
a
gat
e
-C<n>, -p<n> option
s
a
s
well
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Junio C
Haman
o
git
-
am -
-
whitespac
e
:
do not lose th
e
command line opt
i
on
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Tor Arvid Lund
git-p4: Fix bug in p4Where method
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Alex Riesen
Report
sym
l
i
n
k failures i
n
merg
e
-rec
u
rsive
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
l
ex Riesen
Make some of fwrite/fclose/w
r
i
t
e
/close
f
ailures
v
isible
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-04
Junio C Hamano
M
e
r
ge b
r
a
n
ch 'dm
/
svn-remote'
commit
|
commitdiff
|
tree
2008-12-04
Junio C Haman
o
Mer
g
e branch 'jn/gitwe
b
-ut
f
8'
commit
|
commitdiff
|
tree
2008-12-04
J
e
f
f
K
ing
a
dd stage to gitignore
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Mik
l
os Vaj
n
a
submodule: us
e
git
rev-parse -q
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Miklos V
a
j
n
a
rebase: use git rev-
p
arse -q
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Miklos
V
ajna
p
u
ll:
use git
rev-parse -q
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Miklos
V
ajna
lost-found: us
e
g
i
t rev-parse -q
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Miklos
V
a
jna
fil
t
e
r-b
r
anc
h
:
use git r
e
v-parse -q
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Deskin Miller
git-
s
vn: Make branch use correct svn-remote
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Ju
n
i
o
C Hama
n
o
M
e
r
g
e br
a
n
ch 'jc/rm-i-t-
a
'
commit
|
commitdiff
|
tree
2008-12-03
Junio C Ham
a
no
M
erge
branch
'maint
'
commit
|
commitdiff
|
tree
2008-12-03
Junio
C
Ham
a
no
Inst
a
l
l
git
-
stage in e
x
ec-path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next