repo.or.cz
/
git
/
jnareb-git.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
Johannes Sixt
Sh
o
w a f
a
ilure of rebase
-p if
the merge ha
d
a conflict
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Ma
r
kus Heidelberg
Documentati
o
n: fi
x
ty
p
os, grammar, asciidoc syntax
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Ju
n
io C Hamano
Merg
e
branch 'maint
'
to sync w
i
th GIT 1
.
6
.
0
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Junio C Ham
a
no
GIT 1
.
6
.
0
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Junio C Ha
m
ano
f
a
st-impo
r
t
:
make t
a
gger information optio
n
al
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Joh
a
nn
e
s
Schin
d
elin
fast-export: deal with tag o
b
j
ects that d
o
no
t
have
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
M
i
klo
s
Vajna
Submitt
i
n
gP
a
tches: men
t
ion the usage of
r
e
al na
m
e in
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Dav
i
d Aguilar
git
-
mergetool
:
prop
e
rly handle "
g
it merget
o
ol -- fi
l
ename"
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Wu F
e
ngguang
g
i
t-s
e
nd-email: han
d
le
em
a
il
addre
s
s with quoted comma
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-20
Markus Heidelberg
Documentation: fix
t
yp
o
s, grammar, asciido
c
syntax
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-19
Markus Heidelbe
r
g
Document
a
tion:
s
ync exampl
e
ou
t
put with
git output
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
René
Schar
f
e
F
ix t
y
pe-
m
ismatch c
o
mpil
e
r warning from dif
f
_populate_filespe
c
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
Mic
h
a
el J Grub
e
r
test overlapping ignore pat
t
erns
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
Junio
C
H
amano
Mer
g
e bra
n
ch 'lt/readli
n
k'
commit
|
commitdiff
|
tree
2008-12-18
Arjen Laarhoven
Enable threade
d
del
t
a
search
on M
a
c
OS X/Da
r
win
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
N
anako Shiraishi
Clarify documentation
of "git checkout <tree-ish> paths
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-18
Junio C Hamano
Mer
g
e
g
it:
/
/
repo
.
or
.
c
z
/git-gui
commit
|
commitdiff
|
tree
2008-12-17
Mikl
o
s Vajna
gith
o
oks docume
n
t
a
tion: add a no
t
e
about the +x mo
d
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
J
u
nio C Ham
a
no
com
b
ine-diff
.
c: use st
r
b
u
f
_
r
eadlin
k
()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio
C Hamano
bui
l
t
in-blame
.
c: u
s
e str
b
uf_readlink()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Hamano
make_a
b
s
o
lute_p
a
t
h
()
:
chec
k
boun
d
s when seeing an overlong
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
L
inus
Torva
l
ds
Make 'prepare
_
temp_fi
l
e()' ignor
e
st_size for sy
m
lin
k
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
L
i
nus
Tor
v
a
l
d
s
Make 'diff_populate_filespec()' use the new 'strbuf_read
l
ink()'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Linus Torvalds
Make 'in
d
e
x
_path
(
)
' use 'strbuf_readli
n
k()'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Linus Torvalds
Make 'ce_compare_li
n
k()' use the new 'strbuf_readlink()
'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Linus Torval
d
s
Add generic 'strbuf_re
a
dlink()'
h
elper function
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
M
ark
u
s Heide
l
berg
doc/git-reset: add r
e
ference to git-stas
h
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Markus Hei
d
elberg
Documentation: fix descriptio
n
for e
n
ablin
g
hooks
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Mikl
o
s
V
a
j
n
a
g
i
t
-
d
a
em
o
n documentation
:
use
{tild
e
}
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Hamano
gitweb:
d
o not r
u
n "git diff
"
tha
t
is Porcelain
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio
C
H
aman
o
GIT
1
.
5
.
6
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Junio C Ha
m
ano
GIT 1
.
5
.
5
.
6
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-17
Jun
i
o
C
H
a
m
ano
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 not run "gi
t
diff" that is
P
orcel
a
in
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-16
Lee Marlow
bash com
p
le
t
io
n
: Sync config v
a
r
i
ables with
their man
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-16
Lee
M
arlow
bash comp
l
etion: So
r
t
co
n
f
i
g
comp
l
etion variables
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-16
Junio C Ha
m
ano
Merg
e
bran
c
h
'ma
i
nt'
commit
|
commitdiff
|
tree
2008-12-16
Johannes Schindelin
f
a
s
t-
i
mport: c
l
o
s
e p
a
ck before unlinking it
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
Junio C Hamano
pager: do
not dup
2
stde
r
r
i
f it is already redir
e
cted
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
Junio C Ha
m
ano
git-sho
w
: do not
segfa
u
lt when
showing a bad
t
a
g
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
J
ohannes S
c
hindelin
Get rid of the last r
e
m
nants of GIT
_
CONFIG_LO
C
A
L
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
Alexand
e
r Gav
r
ilov
Documentation: De
s
cribe
g
it-gu
i
Tools menu configurat
i
on
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-15
YONETANI Tomokazu
git-fas
t
-import possible
memory corruption problem
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-13
Mar
k
us
Heidelberg
b
u
il
t
in-commit:
remove un
u
sed
m
essage v
a
riable
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-13
Junio C Haman
o
Merge br
a
nch
'maint
'
commit
|
commitdiff
|
tree
2008-12-13
Br
a
ndon C
a
sey
git-bra
n
ch: d
i
splay sha1 on branch deletion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-13
Jim Meyering
gi
t
-con
f
ig
.
txt:
fix a
t
ypo
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-11
Junio C Hamano
M
erge branch 'm
a
int'
commit
|
commitdiff
|
tree
2008-12-11
Linus Tor
v
alds
fsck
:
re
d
u
c
e
stack
footpri
n
t
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-11
Jeff King
rebase: impro
v
e
e
rror mes
s
ages about dirty
stat
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-11
Nicolas
Pitre
make sure packs
to be re
p
laced are close
d
beforehand
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Alexander
Potas
h
ev
Fix
t
ypo in comment in builtin-add
.
c
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Junio C Hamano
Fix t4031
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Junio C Ham
a
no
Merge bra
n
ch 'ma
i
n
t
'
commit
|
commitdiff
|
tree
2008-12-10
Jeff King
diff: res
p
ect text
c
onv i
n
rewri
t
e diffs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
J
eff
K
ing
d
i
ff: fi
x
handlin
g
o
f binary
r
ewrite diff
s
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Alexa
n
der Potashev
Fix typos in d
o
cumenta
t
ion
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
To
r
Arvid Lund
git-p4: Fix regression in p4W
h
ere
m
ethod
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
Ralf Wildenhu
e
s
Improv
e
language in git-mer
g
e
.
t
xt a
n
d
related docs
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-10
J
u
nio C Haman
o
wor
k
around Py
t
hon warn
i
ngs from
AsciiDoc
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-09
Alexe
y
Borze
n
ko
v
D
efine linkgit macro in [macros]
s
ection
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-09
Des
k
in Mi
l
ler
git-svn
:
Make
f
ollo
w
i
ng par
e
nts atomic
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
J
a
kub Narebski
gitweb: Fix
b
u
g in in
s
ert_file()
s
ubrou
t
in
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
J
eff King
d
iff: allow turning on
t
extc
o
nv explicitl
y
fo
r
plum
b
ing
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Jeff Kin
g
reorder ALLOW_TEXTCONV option sett
i
ng
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
J
unio
C Ham
a
no
re
a
d
-
cac
h
e
.
c
: typofix in
com
m
ent
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Junio C Haman
o
builtin-checkout
.
c: check error return from
read_cache()
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
J
unio C Hamano
Point "stale" 1
.
6
.
0
.
5 d
o
cument
a
tion from the ma
i
n git
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-08
Ju
n
io C Hamano
Revert "git-stash: use
g
it rev-pa
r
se -q"
commit
|
commitdiff
|
tree
2008-12-07
Junio C Hamano
U
pdate draft release no
t
e
s
f
or 1
.
6
.
1
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Juni
o
C Ha
m
a
n
o
Merge bran
c
h 'maint'
commit
|
commitdiff
|
tree
2008-12-07
Junio 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 McC
u
tchen
"git
diff <
t
r
e
e>{3,}": do not rev
e
rse order o
f
a
rguments
commit
|
commitdiff
|
tree
2008-12-07
Jeff
King
tag: delete TAG
_
EDITMSG only on
s
ucc
e
ssful tag
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Jakub Narebski
gitweb: Make
p
roject specific override fo
r
'
grep' feature
.
.
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
M
iklos
V
ajna
http
.
c: use 'gi
t
_config_strin
g
'
t
o
g
et '
c
url_http_proxy'
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-07
Tho
m
as Rast
fetch-pack: A
v
o
id memcpy()
with src==dst
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-06
J
unio C H
a
mano
Update draft
r
elease notes
t
o 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
Jun
i
o C Hamano
git-am: r
e
n
ame
a
pply_o
p
t_extra file to ap
p
ly-opt
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Junio C
H
am
a
no
Test that
g
it-am does not lose -C/-
p
/-
-
whi
t
espac
e
options
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
J
unio C Hamano
git-am: propag
a
te --3way options as
well
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
J
unio C
H
amano
git-am: propagate -
C
<n>, -p<n> options as well
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Junio C
H
a
mano
git-am --w
h
itespace: d
o
not
l
o
s
e
the co
m
m
and line optio
n
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Tor Arvid Lund
git-p4:
F
ix
b
ug in p
4
Whe
r
e
m
etho
d
.
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Al
e
x Riesen
Report symlink failures in me
r
ge-recurs
i
ve
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
Alex Ries
e
n
Make c
h
dir
f
ailures visible
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-05
A
lex Riese
n
Make some of fwrite/fclose/writ
e
/close failures v
i
sible
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-04
J
unio C Ham
a
no
M
erge branc
h
'dm/svn-rem
o
te'
commit
|
commitdiff
|
tree
2008-12-04
J
u
nio C Hamano
Merge branc
h
'
j
n
/
gitweb-ut
f
8
'
commit
|
commitdiff
|
tree
2008-12-04
J
e
ff King
add stage to g
i
tignore
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Mik
l
os Vajna
s
u
bmodule: us
e
git
rev-parse -q
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Mikl
o
s V
a
jna
rebase: use
git rev-
p
ar
s
e -q
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Vajn
a
pull: use git rev-parse -q
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
M
iklos
Vajna
lost-f
o
und: use git rev-pars
e
-q
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Miklos Va
j
na
filt
e
r-bran
c
h:
use git
r
ev-parse -q
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
Deskin Miller
git-svn:
Make branch
us
e
correct svn-remo
t
e
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
2008-12-03
J
u
nio C Hamano
Merge branch 'jc/rm-i-t-a'
commit
|
commitdiff
|
tree
2008-12-03
Junio C Ham
a
no
M
erg
e
bran
c
h 'mai
n
t'
commit
|
commitdiff
|
tree
2008-12-03
J
unio C
H
amano
Install
git-stage i
n
exec-path
Signed-off-by: Junio C Hamano <
gitster@pobox.com
>
commit
|
commitdiff
|
tree
next