summaryrefslogtreecommitdiff
path: root/cache.h
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/push-reject-reasons'Junio C Hamano2013-02-041-3/+3
|\
| * push: introduce REJECT_FETCH_FIRST and REJECT_NEEDS_FORCEJunio C Hamano2013-01-241-0/+2
| * push: further clean up fields of "struct ref"Junio C Hamano2013-01-241-3/+1
* | Merge branch 'jk/config-parsing-cleanup'Junio C Hamano2013-02-041-0/+15
|\ \
| * | config: add helper function for parsing key namesJeff King2013-01-231-0/+15
* | | Merge branch 'jc/custom-comment-char'Junio C Hamano2013-02-041-0/+6
|\ \ \
| * | | Allow custom "comment char"Junio C Hamano2013-01-161-0/+6
| |/ /
* | | Merge branch 'rr/minimal-stat'Junio C Hamano2013-01-301-0/+1
|\ \ \
| * | | Enable minimal stat checkingRobin Rosenberg2013-01-221-0/+1
| |/ /
* | | Merge branch 'jk/suppress-clang-warning'Junio C Hamano2013-01-231-1/+1
|\ \ \
| * | | fix clang -Wunused-value warnings for error functionsMax Horn2013-01-161-1/+1
* | | | Merge branch 'cr/push-force-tag-update'Junio C Hamano2013-01-231-1/+0
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | push: fix "refs/tags/ hierarchy cannot be updated without --force"Junio C Hamano2013-01-161-1/+0
* | | Merge branch 'jk/pathspec-literal'Junio C Hamano2013-01-051-0/+3
|\ \ \
| * | | add global --literal-pathspecs optionJeff King2012-12-191-0/+3
* | | | Merge branch 'jk/error-const-return'Junio C Hamano2013-01-051-0/+3
|\ \ \ \ | | |_|/ | |/| |
| * | | silence some -Wuninitialized false positivesJeff King2012-12-151-0/+3
| |/ /
* | | Merge branch 'jk/mailmap-from-blob'Junio C Hamano2013-01-051-0/+1
|\ \ \
| * | | mailmap: support reading mailmap from blobsJeff King2012-12-121-0/+1
| |/ /
* | | Merge branch 'cr/push-force-tag-update'Junio C Hamano2013-01-051-1/+6
|\ \ \ | | |/ | |/|
| * | push: require force for refs under refs/tags/Chris Rorvick2012-12-021-0/+1
| * | push: flag updates that require forceChris Rorvick2012-12-021-1/+3
| * | push: keep track of "update" state separatelyChris Rorvick2012-12-021-0/+1
| * | push: add advice for rejected tag referenceChris Rorvick2012-12-021-0/+1
* | | Merge branch 'nd/pathspec-wildcard'Junio C Hamano2013-01-051-1/+4
|\ \ \
| * | | pathspec: apply "*.c" optimization from excludeNguyễn Thái Ngọc Duy2012-11-261-0/+3
| * | | pathspec: save the non-wildcard length partNguyễn Thái Ngọc Duy2012-11-191-1/+1
| |/ /
* | | Merge branch 'mh/ceiling'Junio C Hamano2013-01-021-1/+2
|\ \ \ | |_|/ |/| |
| * | longest_ancestor_length(): take a string_list argument for prefixesMichael Haggerty2012-10-291-1/+1
| * | Introduce new function real_path_if_valid()Michael Haggerty2012-10-291-0/+1
* | | ident: keep separate "explicit" flags for author and committerJeff King2012-11-151-1/+2
* | | ident: make user_ident_explicitly_given staticJeff King2012-11-151-4/+0
| |/ |/|
* | Move setup_diff_pager to libgit.aNguyễn Thái Ngọc Duy2012-10-291-0/+1
* | Move try_merge_command and checkout_fast_forward to libgit.aNguyễn Thái Ngọc Duy2012-10-291-2/+9
|/
* ident.c: mark private file-scope symbols as staticJunio C Hamano2012-09-151-2/+0
* trace.c: mark a private file-scope symbol as staticJunio C Hamano2012-09-151-1/+0
* read-cache.c: mark a private file-scope symbol as staticJunio C Hamano2012-09-151-1/+0
* symlinks.c: mark private file-scope symbols as staticJunio C Hamano2012-09-151-2/+0
* Merge branch 'jc/maint-config-exit-status'Junio C Hamano2012-09-031-0/+1
|\
| * config: "git config baa" should exit with status 1Junio C Hamano2012-07-301-0/+1
* | Merge branch 'jc/capabilities'Junio C Hamano2012-08-291-1/+3
|\ \
| * | parse_feature_request: make it easier to see feature valuesJeff King2012-08-131-1/+3
* | | Merge branch 'tg/ce-namelen-field'Junio C Hamano2012-07-231-13/+6
|\ \ \
| * | | Strip namelen out of ce_flags into a ce_namelen fieldThomas Gummerer2012-07-111-13/+6
* | | | Merge branch 'jc/sha1-name-more'Junio C Hamano2012-07-221-10/+18
|\ \ \ \
| * | | | rev-parse --disambiguate=<prefix>Junio C Hamano2012-07-091-0/+3
| * | | | sha1_name.c: add support for disambiguating other typesJunio C Hamano2012-07-091-3/+10
| * | | | sha1_name.c: introduce get_sha1_committish()Junio C Hamano2012-07-091-0/+1
| * | | | sha1_name.c: teach lookup context to get_sha1_with_context()Junio C Hamano2012-07-091-1/+2
| * | | | sha1_name.c: many short names can only be committishJunio C Hamano2012-07-091-0/+1
View Lorry Controller Status