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
tag -v: use RUN_GIT_CMD to run verify-tag
2010-04-17
Jonathan Nieder
tag -v: use RUN_G
I
T_CMD to run ve
r
ify-tag
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-15
J
o
n
at
h
an Nieder
Add
.
depend directories t
o
.
giti
g
n
or
e
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-04
Jo
n
atha
n
Ni
e
der
Teach
m
ail
i
nf
o
%< as an alternative
scis
s
ors m
a
rk
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-04-03
Jonathan Nie
d
er
Makef
i
le: future-proof Cygwin version check
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Niede
r
me
r
g
e-recursive:
a
dd a label for ance
s
to
r
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
athan Nieder
che
r
ry-pi
c
k,
r
e
vert:
a
d
d
a label for an
c
estor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonath
a
n Nieder
rever
t
: c
l
arify
label on conflict hunks
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
onath
a
n
N
i
ede
r
c
ompat: add mempcpy()
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jona
t
ha
n
Nieder
checkout
-
m --conflict=diff3:
add
a l
a
b
el for
ancestor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan N
i
ed
e
r
merg
e
_t
r
e
es(): add an
c
es
t
or labe
l
parameter
f
or
d
iff3
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
t
h
an Nieder
m
erge_fi
l
e():
add c
o
mment explaining behavio
r
wrt conf
l
ict
.
.
.
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
c
h
ec
k
out --conf
l
ic
t
=diff3
:
add a label
f
or ance
s
tor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jon
a
th
a
n
Nieder
ll_merge(): add ancestor
l
a
b
el parameter f
o
r dif
f
3
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jo
n
athan Nieder
merge-fil
e
--di
f
f3: add a lab
e
l
for a
n
cestor
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
onatha
n
Nieder
x
d
l_me
r
ge(): move file1
a
nd
f
i
l
e2
l
a
b
e
ls to xmparam
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan
Niede
r
x
dl_merge()
:
add optiona
l
ancestor l
a
bel
t
o
diff3-
s
ty
l
e
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
tes
t
s: document cher
r
y-pick behavior in face
of con
f
licts
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
J
onath
a
n Nieder
tests: d
o
c
ument format of
con
f
licts from checkout -m
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-21
Jonathan Nieder
r
e
ve
r
t: fix tiny
m
emory leak in cher
r
y
-
p
ick -
-
ff
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-20
J
o
nathan
N
i
eder
M
a
kefile
:
Fix oc
c
as
i
onal
GIT-CFLAGS br
e
akage
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-03-20
Jonathan Nieder
Ma
k
efile: Fix CD
P
ATH problem
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-28
J
o
na
t
han Nieder
Makefi
l
e: clarify defin
i
t
i
on of TEST_OBJS
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-23
J
ona
t
han Nie
d
er
am:
remove rebase-
a
pply directory b
e
fore gc
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-22
J
on
a
than Nied
e
r
tests: Fi
x
race condition in t7006
-
pager
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-21
Jonathan Niede
r
t7006
-
pager: if stdout is not a term
i
na
l
, make a new one
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-20
Jonath
a
n Nieder
te
s
ts:
A
dd tests for
aut
o
matic us
e
o
f pa
g
er
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
Jona
t
han Nieder
am
:
Fix launching
of page
r
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
J
on
a
t
han Nieder
git svn: Fix launch
i
ng of
page
r
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
J
o
na
t
han
N
i
e
d
e
r
git
.
1: Clarify th
e
be
h
a
v
i
o
r of
t
h
e
--paginate option
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
Jonathan Niede
r
Mak
e
'git va
r
G
I
T
_PAGER' always print the
configured
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-02-15
J
o
nathan Nieder
Fi
x
'git var' usag
e
sy
n
opsis
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-31
Jon
a
than Nieder
Makefi
l
e: always remove
.
depend directories
on 'ma
k
e
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-31
Jona
t
han N
i
ed
e
r
Make
f
ile: tuck away gene
r
ated ma
k
efile frag
m
ents i
n
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-31
Jonathan Niede
r
Do not
i
nstal
l
shell librar
i
es execu
t
able
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-27
Jo
n
athan Nieder
Tea
c
h
M
a
k
efile to check header dependencies
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-27
Jonathan
Ni
e
der
Makefile: list s
t
an
d
alone progra
m
object files in P
R
OGRAM_OBJS
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonat
h
an Nie
d
e
r
Makefile: lazi
l
y
comput
e
h
eade
r
dep
e
ndencies
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonath
a
n Nieder
Make
f
ile: list
g
ener
a
t
ed objec
t
f
i
les in OBJECTS
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Nie
d
er
Makefile: d
i
sable default
i
mpl
i
cit rules
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonatha
n
Nieder
Makefile: rearrang
e
dependency rules
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jon
a
th
a
n Nieder
Make
f
ile:
t
ransp
o
r
t
.
o depends on bran
c
h
.
h now
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonatha
n
Nied
e
r
Me
r
ge branch
'master' of git://re
p
o
.
o
r
.
cz/alt
-
git into
.
.
.
commit
|
commitdiff
|
tree
2010-01-26
J
o
nathan Nieder
Makefile:
d
r
op dependency on $(wildcard */*
.
h)
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonatha
n
Nieder
Makefile:
clean up http-walker
.
o dependency rules
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonathan Nieder
Ma
k
efi
l
e
:
remove
wt-status
.
h
from LIB_H
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
Jonat
h
an Nieder
M
a
kefile: m
a
k
e
sure test hel
p
ers are rebu
i
lt
w
h
e
n
headers
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-26
J
onathan Nieder
Makefile: add missi
n
g header
file depende
n
cie
s
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jon
a
than Nieder
Do
c
u
m
e
n
tation: merge: u
s
e
M
E
R
GE_HEAD to r
e
fer to
the
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jo
n
athan Nieder
Documentation: simpli
f
y How Merge Works
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
J
o
nathan Nieder
Documentation
:
m
erge:
a
dd a section about fast-forward
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan Nieder
Documentation: emph
a
siz
e
when git merge terminates
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan Nied
e
r
Documentation: merge: add
an overview
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jo
n
athan Nieder
Documentation: mer
g
e: m
o
ve merge st
r
ategy list to end
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
Jonathan Ni
e
der
Doc
u
mentation: su
g
gest `reset --merge` in How Merge
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-24
J
o
nathan N
i
eder
Do
c
umenta
t
ion: merg
e
: move
conf
i
g
urat
i
on section to en
d
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Jon
a
than Ni
e
der
D
ocu
m
e
n
tation: tiny git config manua
l
tweaks
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Jonathan Nie
d
er
Docum
e
ntation: git gc packs re
f
s by default
now
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Jo
n
athan Nieder
Doc
u
men
t
ation: tiny git config
manual
t
w
e
a
ks
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-10
Jonathan
N
ieder
Docum
e
ntation: git gc packs refs by
default now
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-07
Jonathan
Nieder
git
-
gui: Mak
e
f
i
le: cons
o
l
i
date
.
FORCE-* targets
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-06
Jonathan
Nieder
Makefile: consolidate
.
FORCE-* tar
g
ets
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-06
Jonathan Nieder
M
a
ke
f
ile: lea
r
n to
g
enera
t
e listin
g
s fo
r
targets requiring
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-06
Jonathan Niede
r
Makefile: u
s
e
t
arg
e
t-specif
i
c variable
t
o pass flags
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-06
Jonathan Nieder
Mak
e
file: regenerate assembler
listings
wh
e
n as
k
e
d
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2010-01-06
Jonathan Nie
d
er
M
akefi
l
e
:
m
ake p
p
c
/
s
ha1ppc
.
o depe
n
d on GIT-CFLAGS
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-28
Jon
a
than Nieder
Ma
k
efile: do not
c
le
a
n arm directory
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-18
Jonat
h
an Nieder
Speed up bash
c
o
m
pletion loading
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
Jona
t
h
a
n N
i
eder
Provide a build time defaul
t
-editor setting
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
Jonat
h
an Nied
e
r
am -i, git-svn:
use "git var GIT_PAGER"
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
Jonathan Nied
e
r
add -i, send-email, svn, p4, etc: use
"git v
a
r GIT_ED
I
TO
R
"
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
Jonathan N
i
eder
Teach
g
it
v
ar about GIT
_
PAGER
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
Jon
a
than Nieder
T
each git va
r
about G
I
T_EDIT
O
R
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
Jonath
a
n Nieder
S
uppress
war
n
i
ngs from "git
v
ar -l"
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-13
Jonathan Nieder
Do not
u
se VI
S
UAL edi
t
or on dumb
terminals
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nieder
diff
-
-no-index:
ma
k
e t
h
e
usage string l
e
ss scary
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonat
h
an Nieder
mer
g
e-{rec
u
r
s
ive,
s
ubtree}:
u
se usag
e
f() to print us
a
ge
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nieder
Introduc
e
usagef() that
t
akes a print
f
-style
f
ormat
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nie
d
er
Le
t
'
git <command> -h' show usage without a
g
it dir
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nieder
Show usage string for 'git
http-push -
h
'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonatha
n
Nieder
Let 'git
http-fetch
-
h' sh
o
w usage o
u
tsid
e
a
ny gi
t
.
.
.
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nieder
Sh
o
w
usag
e
strin
g
for 'git stripspace -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jon
a
t
han Nieder
S
h
ow usage s
t
ring for '
g
it unpack-fi
l
e -
h
'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jon
a
t
han Nie
d
er
Show us
a
ge st
r
ing for 'git sho
w
-index -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jona
t
han Nied
e
r
Sho
w
usage string for
'git rev-par
s
e -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jona
t
h
a
n Nieder
S
how usage st
r
i
n
g for 'git merge-
o
ne-file -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
J
o
nathan
Nied
e
r
Sho
w
usage string f
o
r 'git mails
p
lit -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
J
onathan Nieder
Sh
o
w
usage string
for 'git ima
p
-send
-h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nieder
Show usage strin
g
for 'git get-tar-commit-
i
d -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jon
a
tha
n
N
i
e
der
S
h
o
w
usage
string for 'gi
t
fast-import
-
h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
J
onathan N
i
e
der
Show us
a
ge s
t
ring for
'
g
it
check-ref-format -h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan
N
ieder
h
ttp-fetc
h
: add missing ini
t
ia
l
ization of arg
v
0_pa
t
h
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jon
a
than Nied
e
r
merge: do no
t
setup w
o
rktree tw
i
ce
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jona
t
ha
n
Nieder
check-
r
ef
-
f
orma
t
: update usage strin
g
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jo
n
athan Nieder
Sho
w
usage s
t
ring for 'git show-ref
-h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Nieder
Show usage string for 'git merge-ours
-h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonat
h
an Nieder
Show usage stri
n
g
f
o
r 'git comm
i
t-tree
-
h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan Ni
e
der
Show usage string for
'g
i
t c
h
erry -h
'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonath
a
n Nie
d
er
Show
u
sage string for 'git g
r
ep
-h'
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-10
Jonathan N
i
eder
Retire
f
etch--tool
h
elper
to con
t
rib/examples
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
2009-11-09
Jona
t
han Ni
e
der
Add
intermediate b
u
ild products to
.
gitignore
Signed-off-by: Jonathan Nieder <
jrnieder@gmail.com
>
commit
|
commitdiff
|
tree
next