Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'tg/ce-namelen-field' | Junio C Hamano | 2012-07-23 | 1 | -13/+6 |
|\ | |||||
| * | Strip namelen out of ce_flags into a ce_namelen field | Thomas Gummerer | 2012-07-11 | 1 | -13/+6 |
* | | Merge branch 'jc/sha1-name-more' | Junio C Hamano | 2012-07-22 | 1 | -10/+18 |
|\ \ | |||||
| * | | rev-parse --disambiguate=<prefix> | Junio C Hamano | 2012-07-09 | 1 | -0/+3 |
| * | | sha1_name.c: add support for disambiguating other types | Junio C Hamano | 2012-07-09 | 1 | -3/+10 |
| * | | sha1_name.c: introduce get_sha1_committish() | Junio C Hamano | 2012-07-09 | 1 | -0/+1 |
| * | | sha1_name.c: teach lookup context to get_sha1_with_context() | Junio C Hamano | 2012-07-09 | 1 | -1/+2 |
| * | | sha1_name.c: many short names can only be committish | Junio C Hamano | 2012-07-09 | 1 | -0/+1 |
| * | | sha1_name.c: teach get_short_sha1() a commit-only option | Junio C Hamano | 2012-07-03 | 1 | -0/+1 |
| * | | sha1_name.c: allow get_short_sha1() to take other flags | Junio C Hamano | 2012-07-03 | 1 | -0/+2 |
| * | | sha1_name.c: get rid of get_sha1_with_mode() | Junio C Hamano | 2012-07-03 | 1 | -1/+0 |
| * | | sha1_name.c: get rid of get_sha1_with_mode_1() | Junio C Hamano | 2012-07-03 | 1 | -5/+2 |
| * | | sha1_name.c: hide get_sha1_with_context_1() ugliness | Junio C Hamano | 2012-07-02 | 1 | -5/+1 |
* | | | Merge branch 'tb/sanitize-decomposed-utf-8-pathname' | Junio C Hamano | 2012-07-13 | 1 | -0/+1 |
|\ \ \ | |_|/ |/| | | |||||
| * | | git on Mac OS and precomposed unicode | Torsten Bögershausen | 2012-07-08 | 1 | -0/+1 |
* | | | Merge branch 'mm/config-xdg' | Junio C Hamano | 2012-07-09 | 1 | -0/+3 |
|\ \ \ | |||||
| * | | | config: read (but not write) from $XDG_CONFIG_HOME/git/config file | Huynh Khoi Nguyen Nguyen | 2012-06-25 | 1 | -0/+3 |
| |/ / | |||||
* | | | Merge branch 'th/diff-no-index-fixes' | Junio C Hamano | 2012-07-04 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | diff: handle relative paths in no-index | Jeff King | 2012-06-22 | 1 | -0/+1 |
| * | | | Merge branch 'hv/submodule-alt-odb' into maint | Junio C Hamano | 2012-05-25 | 1 | -0/+1 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'ct/advise-push-default' into maint | Junio C Hamano | 2012-05-11 | 1 | -1/+2 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'jk/run-command-eacces' into maint | Junio C Hamano | 2012-04-26 | 1 | -0/+2 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'jk/diff-no-rename-empty' into maint | Junio C Hamano | 2012-04-26 | 1 | -0/+13 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'jc/commit-hook-authorship' into maint | Junio C Hamano | 2012-04-26 | 1 | -0/+16 |
| |\ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ | Merge branch 'mm/verify-filename-fix' | Junio C Hamano | 2012-06-28 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | |||||
| * | | | | | | | | verify_filename(): ask the caller to chose the kind of diagnosis | Matthieu Moy | 2012-06-18 | 1 | -1/+3 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jk/ident-gecos-strbuf' | Junio C Hamano | 2012-05-29 | 1 | -6/+7 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | ident: rename IDENT_ERROR_ON_NO_NAME to IDENT_STRICT | Jeff King | 2012-05-24 | 1 | -1/+1 |
| * | | | | | | | | ident: let callers omit name with fmt_indent | Jeff King | 2012-05-24 | 1 | -0/+1 |
| * | | | | | | | | fmt_ident: drop IDENT_WARN_ON_NO_NAME code | Jeff King | 2012-05-22 | 1 | -3/+2 |
| * | | | | | | | | move git_default_* variables to ident.c | Jeff King | 2012-05-22 | 1 | -3/+0 |
| * | | | | | | | | move identity config parsing to ident.c | Jeff King | 2012-05-22 | 1 | -0/+1 |
| * | | | | | | | | ident: split setup_ident into separate functions | Jeff King | 2012-05-22 | 1 | -0/+3 |
* | | | | | | | | | Merge branch 'hv/submodule-alt-odb' | Junio C Hamano | 2012-05-23 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | teach add_submodule_odb() to look for alternates | Heiko Voigt | 2012-05-14 | 1 | -0/+1 |
* | | | | | | | | Merge branch 'nd/i18n' | Junio C Hamano | 2012-05-02 | 1 | -4/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | i18n: mark relative dates for translation | Jonathan Nieder | 2012-04-24 | 1 | -4/+2 |
* | | | | | | | | | Merge branch 'mm/simple-push' | Junio C Hamano | 2012-05-02 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | push: introduce new push.default mode "simple" | Matthieu Moy | 2012-04-24 | 1 | -0/+1 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'jc/index-v4' | Junio C Hamano | 2012-05-02 | 1 | -48/+4 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | read-cache.c: write prefix-compressed names in the index | Junio C Hamano | 2012-04-04 | 1 | -0/+4 |
| * | | | | | | | | cache.h: hide on-disk index details | Junio C Hamano | 2012-04-03 | 1 | -48/+0 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'ct/advise-push-default' | Junio C Hamano | 2012-04-20 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | clean up struct ref's nonfastforward fieldct/advise-push-default | Jeff King | 2012-03-26 | 1 | -4/+1 |
| * | | | | | | | push: Provide situational hints for non-fast-forward errors | Christopher Tiwald | 2012-03-19 | 1 | -2/+6 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'jk/run-command-eacces' | Junio C Hamano | 2012-04-20 | 1 | -0/+2 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | run-command: treat inaccessible directories as ENOENT | Jeff King | 2012-04-05 | 1 | -0/+2 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'jk/diff-no-rename-empty' | Junio C Hamano | 2012-04-16 | 1 | -0/+13 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | make is_empty_blob_sha1 available everywhere | Jeff King | 2012-03-23 | 1 | -0/+13 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'jc/commit-hook-authorship' | Junio C Hamano | 2012-04-15 | 1 | -0/+16 |
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | |